Updated Android Gradle version to 8.1.0

open-eid · Aug 8, 2023 · d01d866 · d01d866
1 parent bf5f509
commit d01d866
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 49 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     namespace 'ee.ria.DigiDoc'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
@@ -59,16 +59,20 @@ android {
         }
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ allprojects {
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:7.2.2'
+            classpath 'com.android.tools.build:gradle:8.1.0'
             classpath "com.google.gms:google-services:4.3.15"
             classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.2"
         }

diff --git a/common-lib/build.gradle b/common-lib/build.gradle
@@ -5,21 +5,25 @@ apply plugin: LibdigidocppPlugin
 
 android {
     namespace 'ee.ria.DigiDoc.common'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/configuration-lib/build.gradle b/configuration-lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'ee.ria.DigiDoc.configuration'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
@@ -11,11 +11,6 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
@@ -24,6 +19,15 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/crypto-lib/build.gradle b/crypto-lib/build.gradle
@@ -2,17 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'ee.ria.DigiDoc.crypto'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
@@ -21,6 +17,14 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,9 @@ appVersionName=2.6.0
 
 appAbiFilters=arm64-v8a;armeabi-v7a;x86;x86_64
 
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 android.jetifier.ignorelist=bcprov-jdk15on
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 24 11:17:49 EET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/id-card-lib/build.gradle b/id-card-lib/build.gradle
@@ -2,21 +2,25 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'ee.ria.DigiDoc.idcard'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/mobile-id-lib/build.gradle b/mobile-id-lib/build.gradle
@@ -2,20 +2,25 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'ee.ria.DigiDoc.mobileid'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/sign-lib/build.gradle b/sign-lib/build.gradle
@@ -5,18 +5,14 @@ apply plugin: LibdigidocppPlugin
 
 android {
     namespace 'ee.ria.DigiDoc.sign'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
-
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
@@ -25,6 +21,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/smart-card-reader-lib/build.gradle b/smart-card-reader-lib/build.gradle
@@ -2,21 +2,25 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'ee.ria.DigiDoc.smartcardreader'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {

diff --git a/smart-id-lib/build.gradle b/smart-id-lib/build.gradle
@@ -2,20 +2,25 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'ee.ria.DigiDoc.smartid'
-    compileSdkVersion project.compileSdkVersion
+    compileSdk project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
     }
 
-    lintOptions {
-        lintConfig file('../lint.xml')
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    lint {
+        lintConfig file('../lint.xml')
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {