From dc81ec603b8b64fee54dc85893e659fba5600da9 Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 8 Aug 2022 13:06:23 +0200 Subject: [PATCH] use gradle 7.5.2 --- android/app/build.gradle | 4 ++-- android/app/src/main/AndroidManifest.xml | 2 +- .../app/src/main/kotlin/com/example/gecko/MainActivity.kt | 6 ------ android/build.gradle | 4 ++-- android/gradle.properties | 3 +-- android/gradle/wrapper/gradle-wrapper.properties | 1 + 6 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 android/app/src/main/kotlin/com/example/gecko/MainActivity.kt diff --git a/android/app/build.gradle b/android/app/build.gradle index ed6574e..710c69b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -40,6 +40,7 @@ android { lintOptions { disable 'InvalidPackage' + abortOnError false } defaultConfig { @@ -65,8 +66,7 @@ android { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.release //poka: comment this to build unsigned release, or set to signingConfigs.debug to sign with debug keys - useProguard true + signingConfig signingConfigs.debug //poka: comment this to build unsigned release, or set to signingConfigs.debug to sign with debug keys proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f2ad465..f1cca29 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -10,8 +10,8 @@ diff --git a/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt b/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt deleted file mode 100644 index de5d149..0000000 --- a/android/app/src/main/kotlin/com/example/gecko/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package gecko.axiomteam.fr - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/android/build.gradle b/android/build.gradle index d6564e8..0945d76 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.6.10' repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/android/gradle.properties b/android/gradle.properties index f233e28..5aed9fb 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.enableR8=true -android.jetifier.blacklist=bcprov-jdk15on \ No newline at end of file +android.suppressUnsupportedCompileSdk=33 \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 493072b..bf1914f 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -4,3 +4,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +