From d01d866ac7d699d1fff32c8913f51786e2e6b7b2 Mon Sep 17 00:00:00 2001 From: Marten Rebane <54431068+martenrebane@users.noreply.github.com> Date: Tue, 8 Aug 2023 16:07:36 +0300 Subject: [PATCH] Updated Android Gradle version to 8.1.0 --- app/build.gradle | 18 +++++++++++------- build.gradle | 2 +- common-lib/build.gradle | 14 +++++++++----- configuration-lib/build.gradle | 16 ++++++++++------ crypto-lib/build.gradle | 14 +++++++++----- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- id-card-lib/build.gradle | 14 +++++++++----- mobile-id-lib/build.gradle | 13 +++++++++---- sign-lib/build.gradle | 14 +++++++++----- smart-card-reader-lib/build.gradle | 14 +++++++++----- smart-id-lib/build.gradle | 13 +++++++++---- 12 files changed, 89 insertions(+), 49 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c82a223aa..6d01b95ad 100755 --- 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 index 2037dc0ee..8d855ad1d 100755 --- 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 index 19ce9f95c..b53f02f1b 100644 --- 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 index 097747e48..d9a6467bb 100644 --- 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 index 229955c0f..ef0f62842 100644 --- 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 index 6df5d93ae..741ec32e6 100644 --- 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 index 357723a07..aab381c83 100755 --- 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 index bfb3d6438..1bcf138a1 100644 --- 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 index 95ee9b3c2..4a39ed6b7 100644 --- 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 index 15e74b7bd..c4634b813 100644 --- a/sign-lib/build.gradle +++ b/sign-lib/build.gradle @@ -5,7 +5,7 @@ apply plugin: LibdigidocppPlugin android { namespace 'ee.ria.DigiDoc.sign' - compileSdkVersion project.compileSdkVersion + compileSdk project.compileSdkVersion defaultConfig { minSdkVersion project.minSdkVersion @@ -13,10 +13,6 @@ android { 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 index 39eee500a..b3f492ddb 100644 --- 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 index c8a9b1fb6..6a67a52ea 100644 --- 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 {