upgrade to Gradle version 8.6 (plugin version 8.4)

2024-10-08 16:03:03 +02:00
parent 73a8ec27d4
commit f0fd21a6ec
15 changed files with 25 additions and 17 deletions
--- a/src/java/JavaFileStorage/build.gradle
+++ b/src/java/JavaFileStorage/build.gradle
@@ -6,7 +6,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:8.4.0"
    }
 }

--- 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
--- a/src/java/JavaFileStorageTest-AS/build.gradle
+++ b/src/java/JavaFileStorageTest-AS/build.gradle
@@ -7,7 +7,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:8.4.0"

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
--- a/src/java/KP2AKdbLibrary/app/build.gradle
+++ b/src/java/KP2AKdbLibrary/app/build.gradle
@@ -4,11 +4,13 @@ android {

    namespace 'keepass2android.kp2akeytransform'

-    compileSdkVersion 33
+

    defaultConfig {
        ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
-
+        minSdkVersion 21
+        targetSdkVersion 34
+        compileSdk 34

    }

--- a/src/java/KP2AKdbLibrary/build.gradle
+++ b/src/java/KP2AKdbLibrary/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:8.4.0"
    }
 }

--- 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
--- a/src/java/KP2ASoftkeyboard_AS/app/build.gradle
+++ b/src/java/KP2ASoftkeyboard_AS/app/build.gradle
@@ -3,10 +3,12 @@ android {

    namespace 'keepass2android.softkeyboard'

-    compileSdkVersion 33
+

    defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 21
+        compileSdk 34
+        targetSdk 34
    }

    buildTypes {
--- a/src/java/KP2ASoftkeyboard_AS/build.gradle
+++ b/src/java/KP2ASoftkeyboard_AS/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:8.4.0"
    }
 }

--- 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
--- a/src/java/Keepass2AndroidPluginSDK2/build.gradle
+++ b/src/java/Keepass2AndroidPluginSDK2/build.gradle
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:8.4.0"

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
--- a/src/java/android-filechooser-AS/app/build.gradle
+++ b/src/java/android-filechooser-AS/app/build.gradle
@@ -18,6 +18,10 @@ android {
            debuggable false
        }
    }
+
+    buildFeatures {
+        buildConfig true
+    }
    compileOptions {
        targetCompatibility 11
        sourceCompatibility 11
--- a/src/java/android-filechooser-AS/build.gradle
+++ b/src/java/android-filechooser-AS/build.gradle
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.android.tools.build:gradle:8.4.0"

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties
+++ b/src/java/android-filechooser-AS/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 20 20:32:06 CEST 2016
+#Tue Oct 08 15:41:22 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip