From d6486d4b988084208515b37a9ed4d82d78671143 Mon Sep 17 00:00:00 2001 From: tenzap Date: Thu, 26 Jan 2023 20:44:29 +0100 Subject: [PATCH 1/3] Java modules: Upgrade to AGP 7.4.0 & Gradle 7.6 Fix the issues that were reported because of that change: WARNING:The specified Android SDK Build Tools version (28.0.3) is ignored, as it is below the minimum supported version (30.0.3) for Android Gradle Plugin 7.4.0. Android SDK Build Tools 30.0.3 will be used. To suppress this warning, remove "buildToolsVersion '28.0.3'" from your build.gradle file, as each version of the Android Gradle Plugin now has a default version of the build tools. android:exported needs to be explicitly specified for element . Apps targeting Android 12 and higher are required to specify an explicit value for `android:exported` when the corresponding component has an intent filter defined. See https://developer.android.com/guide/topics/manifest/activity-element#exported for details. Setting the namespace via a source AndroidManifest.xml's package attribute is deprecated. Please instead set the namespace (or testNamespace) in the module's build.gradle file, as described here: https://developer.android.com/studio/build/configure-app-module#set-namespace This migration can be done automatically using the AGP Upgrade Assistant, please refer to https://developer.android.com/studio/build/agp-upgrade-assistant for more information. .../keepass2android/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml:5:5-46 Warning: uses-sdk:targetSdkVersion value (14) specified in the manifest file is ignored. It is overridden by the value declared in the DSL or the variant API, or 1 if not declared/present. Current value is (18). --- src/java/JavaFileStorage/app/build.gradle | 29 ++++++++++--------- .../app/src/main/AndroidManifest.xml | 6 +--- src/java/JavaFileStorage/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../JavaFileStorageTest-AS/app/build.gradle | 12 ++++---- .../app/src/main/AndroidManifest.xml | 12 ++++---- src/java/JavaFileStorageTest-AS/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src/java/KP2AKdbLibrary/app/build.gradle | 4 ++- .../app/src/main/AndroidManifest.xml | 3 +- src/java/KP2AKdbLibrary/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src/java/KP2ASoftkeyboard_AS/app/build.gradle | 4 ++- .../app/src/main/AndroidManifest.xml | 4 +-- src/java/KP2ASoftkeyboard_AS/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../app/build.gradle | 4 ++- .../app/src/main/AndroidManifest.xml | 1 - .../Keepass2AndroidPluginSDK2/build.gradle | 7 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src/java/PluginQR/app/build.gradle | 8 ++--- .../PluginQR/app/src/main/AndroidManifest.xml | 5 ++-- src/java/PluginQR/build.gradle | 8 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android-filechooser-AS/app/build.gradle | 6 ++-- .../app/src/main/AndroidManifest.xml | 5 ++-- src/java/android-filechooser-AS/build.gradle | 2 +- .../android-filechooser-AS/gradle.properties | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src/java/android-filechooser-AS/gradlew | 0 30 files changed, 74 insertions(+), 71 deletions(-) mode change 100644 => 100755 src/java/android-filechooser-AS/gradlew diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle index a1f9883d..b00f006f 100644 --- a/src/java/JavaFileStorage/app/build.gradle +++ b/src/java/JavaFileStorage/app/build.gradle @@ -1,8 +1,11 @@ apply plugin: 'com.android.library' android { + + namespace 'keepass2android.javafilestorage' + compileSdkVersion 28 - buildToolsVersion '28.0.3' + defaultConfig { minSdkVersion 15 targetSdkVersion 28 @@ -27,27 +30,27 @@ NOTE: If you change dependencies here, don't forget to update the jar files in J dependencies { - compile 'com.squareup.okhttp3:okhttp:4.10.0-RC1' - compile 'com.burgstaller:okhttp-digest:2.5' + implementation 'com.squareup.okhttp3:okhttp:4.10.0-RC1' + implementation 'com.burgstaller:okhttp-digest:2.5' - compile 'com.google.http-client:google-http-client-gson:1.20.0' - compile('com.google.api-client:google-api-client-android:1.30.5') { + implementation 'com.google.http-client:google-http-client-gson:1.20.0' + implementation('com.google.api-client:google-api-client-android:1.30.5') { exclude group: 'com.google.android.google-play-services' } - compile 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc' - compile 'com.dropbox.core:dropbox-core-sdk:4.0.0' + implementation 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc' + implementation 'com.dropbox.core:dropbox-core-sdk:4.0.0' implementation 'com.google.api-client:google-api-client:1.30.5' implementation 'com.google.api-client:google-api-client-android:1.30.5' implementation 'com.google.android.gms:play-services-auth:20.4.0' //onedrive: - compile('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { + implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { transitive = false } - compile 'com.pcloud.sdk:java-core:1.2.0' - compile 'com.pcloud.sdk:android:1.2.0' - compile 'com.google.code.gson:gson:2.8.6' - compile 'com.microsoft.services.msa:msa-auth:0.8.6' - compile 'com.microsoft.aad:adal:1.14.0' + implementation 'com.pcloud.sdk:java-core:1.2.0' + implementation 'com.pcloud.sdk:android:1.2.0' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.microsoft.services.msa:msa-auth:0.8.6' + implementation 'com.microsoft.aad:adal:1.14.0' } diff --git a/src/java/JavaFileStorage/app/src/main/AndroidManifest.xml b/src/java/JavaFileStorage/app/src/main/AndroidManifest.xml index cbb0dce1..ed3c4021 100644 --- a/src/java/JavaFileStorage/app/src/main/AndroidManifest.xml +++ b/src/java/JavaFileStorage/app/src/main/AndroidManifest.xml @@ -1,13 +1,9 @@ - - @@ -17,4 +13,4 @@ android:label="Keepass2Android"> - \ No newline at end of file + diff --git a/src/java/JavaFileStorage/build.gradle b/src/java/JavaFileStorage/build.gradle index 512a28ae..8c0b6e64 100644 --- a/src/java/JavaFileStorage/build.gradle +++ b/src/java/JavaFileStorage/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath "com.android.tools.build:gradle:7.4.0" } } diff --git a/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties b/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties index 89f68a2e..416fba2d 100644 --- a/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/JavaFileStorage/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/JavaFileStorageTest-AS/app/build.gradle b/src/java/JavaFileStorageTest-AS/app/build.gradle index 1c32996a..8a8fb76a 100644 --- a/src/java/JavaFileStorageTest-AS/app/build.gradle +++ b/src/java/JavaFileStorageTest-AS/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' android { + namespace "com.crocoapps.javafilestoragetest2" + compileSdkVersion 28 - buildToolsVersion '28.0.3' defaultConfig { applicationId "com.crocoapps.javafilestoragetest2" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 31 versionCode 1 versionName "1.0" multiDexEnabled true @@ -31,10 +32,11 @@ android { //apply plugin: 'com.getkeepsafe.dexcount' dependencies { - compile project(':android-filechooser') - compile project(':JavaFileStorage') + implementation project(':android-filechooser') + implementation project(':JavaFileStorage') + implementation "androidx.annotation:annotation:1.5.0" } configurations { - compile.exclude group: "org.apache.httpcomponents", module: "httpclient" + implementation.exclude group: "org.apache.httpcomponents", module: "httpclient" } diff --git a/src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml b/src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml index 08a9d9f6..bbc22be0 100644 --- a/src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml +++ b/src/java/JavaFileStorageTest-AS/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - + @@ -49,6 +49,7 @@ @@ -63,7 +64,8 @@ + android:name="com.microsoft.identity.client.BrowserTabActivity" + android:exported="true"> @@ -86,4 +88,4 @@ - \ No newline at end of file + diff --git a/src/java/JavaFileStorageTest-AS/build.gradle b/src/java/JavaFileStorageTest-AS/build.gradle index d80f8739..e9a3bc2a 100644 --- a/src/java/JavaFileStorageTest-AS/build.gradle +++ b/src/java/JavaFileStorageTest-AS/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath "com.android.tools.build:gradle:7.4.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/src/java/JavaFileStorageTest-AS/gradle/wrapper/gradle-wrapper.properties b/src/java/JavaFileStorageTest-AS/gradle/wrapper/gradle-wrapper.properties index 47e69a51..9009fb73 100644 --- a/src/java/JavaFileStorageTest-AS/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/JavaFileStorageTest-AS/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/KP2AKdbLibrary/app/build.gradle b/src/java/KP2AKdbLibrary/app/build.gradle index d8bb2f94..588d55ef 100644 --- a/src/java/KP2AKdbLibrary/app/build.gradle +++ b/src/java/KP2AKdbLibrary/app/build.gradle @@ -1,8 +1,10 @@ apply plugin: 'com.android.library' android { + + namespace 'keepass2android.kp2akeytransform' + compileSdkVersion 23 - buildToolsVersion '28.0.3' defaultConfig { ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64' diff --git a/src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml b/src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml index 1b4134bc..2e05240f 100644 --- a/src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml +++ b/src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ @@ -7,4 +6,4 @@ - \ No newline at end of file + diff --git a/src/java/KP2AKdbLibrary/build.gradle b/src/java/KP2AKdbLibrary/build.gradle index 660bcc5c..5948f187 100644 --- a/src/java/KP2AKdbLibrary/build.gradle +++ b/src/java/KP2AKdbLibrary/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath "com.android.tools.build:gradle:7.4.0" } } diff --git a/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties b/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties index 71a44b01..37a1745a 100644 --- a/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/KP2ASoftkeyboard_AS/app/build.gradle b/src/java/KP2ASoftkeyboard_AS/app/build.gradle index 128926d5..76d26811 100644 --- a/src/java/KP2ASoftkeyboard_AS/app/build.gradle +++ b/src/java/KP2ASoftkeyboard_AS/app/build.gradle @@ -1,7 +1,9 @@ apply plugin: 'com.android.library' android { + + namespace 'keepass2android.softkeyboard' + compileSdkVersion 23 - buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 18 diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml index dc35604c..6e672a9b 100644 --- a/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml +++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ - + - diff --git a/src/java/KP2ASoftkeyboard_AS/build.gradle b/src/java/KP2ASoftkeyboard_AS/build.gradle index b37a7089..44923221 100644 --- a/src/java/KP2ASoftkeyboard_AS/build.gradle +++ b/src/java/KP2ASoftkeyboard_AS/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath "com.android.tools.build:gradle:4.0.1" + classpath "com.android.tools.build:gradle:7.4.0" } } diff --git a/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties b/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties index 1efccb2f..da83b7b9 100644 --- a/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/Keepass2AndroidPluginSDK2/app/build.gradle b/src/java/Keepass2AndroidPluginSDK2/app/build.gradle index 72f51720..6bdf18de 100644 --- a/src/java/Keepass2AndroidPluginSDK2/app/build.gradle +++ b/src/java/Keepass2AndroidPluginSDK2/app/build.gradle @@ -1,7 +1,9 @@ apply plugin: 'com.android.library' android { + + namespace 'keepass2android.pluginsdk' + compileSdkVersion 23 - buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 8 diff --git a/src/java/Keepass2AndroidPluginSDK2/app/src/main/AndroidManifest.xml b/src/java/Keepass2AndroidPluginSDK2/app/src/main/AndroidManifest.xml index b129b998..402263c5 100644 --- a/src/java/Keepass2AndroidPluginSDK2/app/src/main/AndroidManifest.xml +++ b/src/java/Keepass2AndroidPluginSDK2/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ diff --git a/src/java/Keepass2AndroidPluginSDK2/build.gradle b/src/java/Keepass2AndroidPluginSDK2/build.gradle index 9ec67506..3878eca5 100644 --- a/src/java/Keepass2AndroidPluginSDK2/build.gradle +++ b/src/java/Keepass2AndroidPluginSDK2/build.gradle @@ -3,13 +3,10 @@ buildscript { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath "com.android.tools.build:gradle:7.4.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties b/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties index e4c40348..87321f86 100644 --- a/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/Keepass2AndroidPluginSDK2/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/PluginQR/app/build.gradle b/src/java/PluginQR/app/build.gradle index af91bc50..c9fa19e6 100644 --- a/src/java/PluginQR/app/build.gradle +++ b/src/java/PluginQR/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { + namespace 'keepass2android.plugin.qr' compileSdkVersion 26 - buildToolsVersion '28.0.3' defaultConfig { applicationId "keepass2android.plugin.qr" minSdkVersion 14 - targetSdkVersion 19 + targetSdkVersion 31 versionCode 3 versionName "1.0.2" } @@ -32,6 +32,6 @@ android { } dependencies { - compile project(':Keepass2AndroidPluginSDK2') - compile 'com.google.zxing:core:2.3.0' + implementation project(':Keepass2AndroidPluginSDK2') + implementation 'com.google.zxing:core:2.3.0' } diff --git a/src/java/PluginQR/app/src/main/AndroidManifest.xml b/src/java/PluginQR/app/src/main/AndroidManifest.xml index 046a18f7..35fd3315 100644 --- a/src/java/PluginQR/app/src/main/AndroidManifest.xml +++ b/src/java/PluginQR/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -47,6 +47,7 @@ diff --git a/src/java/PluginQR/build.gradle b/src/java/PluginQR/build.gradle index f86f2fb5..773d0862 100644 --- a/src/java/PluginQR/build.gradle +++ b/src/java/PluginQR/build.gradle @@ -2,18 +2,16 @@ buildscript { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath "com.android.tools.build:gradle:7.4.0" } } allprojects { repositories { jcenter() + google() } } diff --git a/src/java/PluginQR/gradle/wrapper/gradle-wrapper.properties b/src/java/PluginQR/gradle/wrapper/gradle-wrapper.properties index 47e69a51..9009fb73 100644 --- a/src/java/PluginQR/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/PluginQR/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/android-filechooser-AS/app/build.gradle b/src/java/android-filechooser-AS/app/build.gradle index 76a4ee1d..b460cd56 100644 --- a/src/java/android-filechooser-AS/app/build.gradle +++ b/src/java/android-filechooser-AS/app/build.gradle @@ -1,8 +1,10 @@ apply plugin: 'com.android.library' android { + + namespace 'group.pals.android.lib.ui.filechooser' + compileSdkVersion 28 - buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 16 @@ -23,5 +25,5 @@ android { } dependencies { - compile 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' } diff --git a/src/java/android-filechooser-AS/app/src/main/AndroidManifest.xml b/src/java/android-filechooser-AS/app/src/main/AndroidManifest.xml index b9739a84..91a1549f 100644 --- a/src/java/android-filechooser-AS/app/src/main/AndroidManifest.xml +++ b/src/java/android-filechooser-AS/app/src/main/AndroidManifest.xml @@ -6,8 +6,7 @@ permission. --> - + - \ No newline at end of file + diff --git a/src/java/android-filechooser-AS/build.gradle b/src/java/android-filechooser-AS/build.gradle index d80f8739..e9a3bc2a 100644 --- a/src/java/android-filechooser-AS/build.gradle +++ b/src/java/android-filechooser-AS/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath "com.android.tools.build:gradle:7.4.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/src/java/android-filechooser-AS/gradle.properties b/src/java/android-filechooser-AS/gradle.properties index 0bb15d79..57d1a3df 100644 --- a/src/java/android-filechooser-AS/gradle.properties +++ b/src/java/android-filechooser-AS/gradle.properties @@ -1 +1,2 @@ -org.gradle.jvmargs=-Xmx1024m \ No newline at end of file +org.gradle.jvmargs=-Xmx1024m +android.useAndroidX=true diff --git a/src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties b/src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties index 2343bebf..de600804 100644 --- a/src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties +++ b/src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/src/java/android-filechooser-AS/gradlew b/src/java/android-filechooser-AS/gradlew old mode 100644 new mode 100755 From e42b4c9654110b2e6a42bbc0092fed415ba6d340 Mon Sep 17 00:00:00 2001 From: tenzap Date: Thu, 26 Jan 2023 21:11:16 +0100 Subject: [PATCH 2/3] Java modules: update repository sources --- src/java/JavaFileStorage/build.gradle | 9 ++++----- src/java/JavaFileStorageTest-AS/build.gradle | 9 ++++----- src/java/KP2AKdbLibrary/build.gradle | 12 ++---------- src/java/KP2ASoftkeyboard_AS/build.gradle | 13 +++---------- src/java/Keepass2AndroidPluginSDK2/build.gradle | 4 ++-- src/java/PluginQR/build.gradle | 4 ++-- src/java/android-filechooser-AS/build.gradle | 9 +++------ 7 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/java/JavaFileStorage/build.gradle b/src/java/JavaFileStorage/build.gradle index 8c0b6e64..aaa5b130 100644 --- a/src/java/JavaFileStorage/build.gradle +++ b/src/java/JavaFileStorage/build.gradle @@ -1,11 +1,9 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { + google() + mavenCentral() jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -14,7 +12,8 @@ buildscript { allprojects { repositories { + google() + mavenCentral() jcenter() - google() } } diff --git a/src/java/JavaFileStorageTest-AS/build.gradle b/src/java/JavaFileStorageTest-AS/build.gradle index e9a3bc2a..f6602f67 100644 --- a/src/java/JavaFileStorageTest-AS/build.gradle +++ b/src/java/JavaFileStorageTest-AS/build.gradle @@ -2,11 +2,9 @@ buildscript { repositories { + google() + mavenCentral() jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -20,8 +18,9 @@ buildscript { allprojects { repositories { - jcenter() google() + mavenCentral() + jcenter() } } diff --git a/src/java/KP2AKdbLibrary/build.gradle b/src/java/KP2AKdbLibrary/build.gradle index 5948f187..51e333e4 100644 --- a/src/java/KP2AKdbLibrary/build.gradle +++ b/src/java/KP2AKdbLibrary/build.gradle @@ -1,12 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() google() - maven { - url 'https://maven.google.com/' - name 'Google' - } + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -15,11 +11,7 @@ buildscript { allprojects { repositories { - jcenter() google() - maven { - url 'https://maven.google.com/' - name 'Google' - } + mavenCentral() } } diff --git a/src/java/KP2ASoftkeyboard_AS/build.gradle b/src/java/KP2ASoftkeyboard_AS/build.gradle index 44923221..51e333e4 100644 --- a/src/java/KP2ASoftkeyboard_AS/build.gradle +++ b/src/java/KP2ASoftkeyboard_AS/build.gradle @@ -1,11 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -15,10 +12,6 @@ buildscript { allprojects { repositories { google() - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + mavenCentral() } } diff --git a/src/java/Keepass2AndroidPluginSDK2/build.gradle b/src/java/Keepass2AndroidPluginSDK2/build.gradle index 3878eca5..f1db4422 100644 --- a/src/java/Keepass2AndroidPluginSDK2/build.gradle +++ b/src/java/Keepass2AndroidPluginSDK2/build.gradle @@ -2,8 +2,8 @@ buildscript { repositories { - jcenter() google() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -17,8 +17,8 @@ buildscript { allprojects { repositories { - jcenter() google() + mavenCentral() } } diff --git a/src/java/PluginQR/build.gradle b/src/java/PluginQR/build.gradle index 773d0862..c7db2bab 100644 --- a/src/java/PluginQR/build.gradle +++ b/src/java/PluginQR/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() google() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -10,8 +10,8 @@ buildscript { } allprojects { repositories { - jcenter() google() + mavenCentral() } } diff --git a/src/java/android-filechooser-AS/build.gradle b/src/java/android-filechooser-AS/build.gradle index e9a3bc2a..f1db4422 100644 --- a/src/java/android-filechooser-AS/build.gradle +++ b/src/java/android-filechooser-AS/build.gradle @@ -2,11 +2,8 @@ buildscript { repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:7.4.0" @@ -20,8 +17,8 @@ buildscript { allprojects { repositories { - jcenter() google() + mavenCentral() } } From 91b59c7c9f7049d2ce914491bc563140089d2ce4 Mon Sep 17 00:00:00 2001 From: tenzap Date: Thu, 26 Jan 2023 21:55:19 +0100 Subject: [PATCH 3/3] github workflow: switch to JDK 11 Since Android Gradle plugin was updated, it now requires JDK 11. Fixes: > Could not resolve all files for configuration ':classpath'. > Could not resolve com.android.tools.build:gradle:7.4.0. Required by: project : > No matching variant of com.android.tools.build:gradle:7.4.0 was found. The consumer was configured to find a runtime of a library compatible with Java 8, packaged as a jar, and its dependencies declared externally, as well as attribute 'org.gradle.plugin.api-version' with value '7.6' but: - Variant 'apiElements' capability com.android.tools.build:gradle:7.4.0 declares a library, packaged as a jar, and its dependencies declared externally: - Incompatible because this component declares an API of a component compatible with Java 11 and the consumer needed a runtime of a component compatible with Java 8 - Other compatible attribute: - Doesn't say anything about org.gradle.plugin.api-version (required '7.6') --- .github/workflows/build.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb5b3711..49a4a1b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,11 +49,10 @@ jobs: # If using the github runner 'macos-10.15' # $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2 - - name: Switch to JDK-8 - if: ${{ false }} # Not needed, we stay with the default installed JDK + - name: Switch to JDK-11 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Display java version @@ -177,11 +176,10 @@ jobs: sudo apt install -y ./xamarin.android-oss/*.deb && echo "$HOME/xamarin.android-oss/bin/Release/bin" >> $GITHUB_PATH - - name: Switch to JDK-8 - if: ${{ false }} # Not needed, we stay with the default installed JDK + - name: Switch to JDK-11 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Display java version @@ -279,6 +277,15 @@ jobs: # If we want to also have nmake, use this instead #uses: ilammy/msvc-dev-cmd@v1 + - name: Switch to JDK-11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Display java version + run: java -version + # Some components of Keepass2Android currently target android API 26 which are not available on the runner - name: Download android-26 API shell: cmd