update gradle 8.0.0

2024-08-08 14:08:42 +07:00 · 2024-08-08 14:08:42 +07:00 · 8eec459e70
commit 8eec459e70
parent ee29d87c72
22 changed files with 53 additions and 36 deletions
--- a/build.gradle
+++ b/build.gradle
@ -28,7 +28,7 @@ buildscript {
    ext.wireVersion = '4.8.0'


-    ext.androidBuildGradleVersion = '7.4.2'
+    ext.androidBuildGradleVersion = '8.0.0'
    ext.androidBuildVersionTools = '33.0.2'

    ext.androidMinSdk = 23
--- a/fake-signature/build.gradle
+++ b/fake-signature/build.gradle
@ -17,8 +17,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@ -1,3 +1,5 @@
 android.useAndroidX=true
-android.disableAutomaticComponentCreation=true
 org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@ -26,9 +26,13 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.api'
 }

 dependencies {
--- a/play-services-api/src/main/AndroidManifest.xml
+++ b/play-services-api/src/main/AndroidManifest.xml
@ -15,4 +15,4 @@
  ~ limitations under the License.
  -->

-<manifest package="org.microg.gms.api"/>
+<manifest />
--- a/play-services-base-api/build.gradle
+++ b/play-services-base-api/build.gradle
@ -34,7 +34,11 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.base.api'
 }
--- a/play-services-base-api/src/main/AndroidManifest.xml
+++ b/play-services-base-api/src/main/AndroidManifest.xml
@ -3,4 +3,4 @@
  ~ SPDX-FileCopyrightText: 2020, microG Project Team
  ~ SPDX-License-Identifier: Apache-2.0
  -->
-<manifest package="org.microg.gms.base.api"/>
+<manifest />
--- a/play-services-base-core/build.gradle
+++ b/play-services-base-core/build.gradle
@ -21,7 +21,6 @@ android {
    buildToolsVersion androidBuildVersionTools

    defaultConfig {
-        versionName version
        minSdkVersion androidMinSdk
        targetSdkVersion androidTargetSdk

@ -33,7 +32,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }
+    namespace 'org.microg.gms.base.core'
 }
--- a/play-services-base-core/src/main/AndroidManifest.xml
+++ b/play-services-base-core/src/main/AndroidManifest.xml
@ -4,8 +4,7 @@
  ~ SPDX-License-Identifier: Apache-2.0
  -->
 <manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.base.core">
+    xmlns:android="http://schemas.android.com/apk/res/android">

    <application>
        <provider
--- a/play-services-base/build.gradle
+++ b/play-services-base/build.gradle
@ -26,9 +26,10 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }
+    namespace 'org.microg.gms.base'
 }

 dependencies {
--- a/play-services-base/src/main/AndroidManifest.xml
+++ b/play-services-base/src/main/AndroidManifest.xml
@ -15,8 +15,7 @@
  ~ limitations under the License.
  -->

-<manifest package="org.microg.gms.base"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <application>
        <meta-data
--- a/play-services-basement/build.gradle
+++ b/play-services-basement/build.gradle
@ -44,6 +44,7 @@ android {

    buildFeatures {
        viewBinding = true
+        aidl true
    }

    sourceSets {
@ -51,7 +52,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }
+    namespace 'org.microg.gms.basement'
 }
--- a/play-services-basement/src/main/AndroidManifest.xml
+++ b/play-services-basement/src/main/AndroidManifest.xml
@ -15,4 +15,4 @@
  ~ limitations under the License.
  -->

-<manifest package="org.microg.gms.basement"/>
+<manifest />
--- a/play-services-core-proto/build.gradle
+++ b/play-services-core-proto/build.gradle
@ -21,9 +21,9 @@ sourceSets {
 }

 compileKotlin {
-    kotlinOptions.jvmTarget = 1.8
+    kotlinOptions.jvmTarget = 17
 }

 compileTestKotlin {
-    kotlinOptions.jvmTarget = 1.8
+    kotlinOptions.jvmTarget = 17
 }
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@ -109,8 +109,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }

    packagingOptions {
--- a/play-services-core/microg-ui-tools/build.gradle
+++ b/play-services-core/microg-ui-tools/build.gradle
@ -28,14 +28,15 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }

    lintOptions {
        // TODO: Remove MissingTranslation once we have stable strings and proper translations.
        disable 'MissingTranslation', 'GetLocales'
    }
+    namespace 'org.microg.tools.ui'
 }

 dependencies {
--- a/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml
+++ b/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml
@ -15,4 +15,4 @@
  ~ limitations under the License.
  -->

-<manifest package="org.microg.tools.ui" />
+<manifest />
--- a/play-services-iid-api/build.gradle
+++ b/play-services-iid-api/build.gradle
@ -26,9 +26,13 @@ android {
    }

    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 17
+        targetCompatibility = 17
    }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.iid.api'
 }

 dependencies {
--- a/play-services-iid-api/src/main/AndroidManifest.xml
+++ b/play-services-iid-api/src/main/AndroidManifest.xml
@ -15,4 +15,4 @@
  ~ limitations under the License.
  -->

-<manifest package="org.microg.gms.iid.api"/>
+<manifest />
--- a/Show more
+++ b/Show more