Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
applicationId "com.draabek.fractal"
minSdkVersion 14
targetSdkVersion 30
targetSdkVersion 33
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
}
lintOptions {
disable "MinSdkTooLow", "OldTargetApi", "SameReturnValue", "SameParameterValue", "WeakerAccess"
abortOnError false
}
buildTypes {
release {
minifyEnabled true
Expand Down Expand Up @@ -45,20 +41,25 @@ android {
includeAndroidResources = true
}
}
lint {
abortOnError false
disable 'MinSdkTooLow', 'OldTargetApi', 'SameReturnValue', 'SameParameterValue', 'WeakerAccess'
}
namespace 'com.draabek.fractal'
}


dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestUtil 'androidx.test:orchestrator:1.4.0'
androidTestImplementation 'androidx.test:core:1.4.0';
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.code.gson:gson:2.8.5'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestUtil 'androidx.test:orchestrator:1.4.2'
androidTestImplementation 'androidx.test:core:1.5.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'com.google.code.gson:gson:2.10.1'
testImplementation 'junit:junit:4.13.2'
}
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.draabek.fractal">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- Tell the system this app requires OpenGL ES 2.0. -->
<uses-feature
Expand All @@ -19,7 +18,8 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".activity.MainActivity">
<activity android:name=".activity.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
11 changes: 3 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@

buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
//noinspection GradleDependency
classpath 'com.android.tools.build:gradle:3.3.0-rc03'
//classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
classpath 'com.android.tools.build:gradle:7.4.0'
}
}

Expand All @@ -17,10 +15,7 @@ plugins {

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
mavenCentral()
google()
}
}
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
org.gradle.configureondemand=false
org.gradle.configureondemand=false

android.useAndroidX=true
android.enableJetifier=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 08 20:48:23 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
Loading