From a83ef6cb124a02dc7804ca82e5a39c1bae4c1fdc Mon Sep 17 00:00:00 2001 From: inotia00 Date: Mon, 6 Mar 2023 11:00:01 +0900 Subject: [PATCH] build: bump dependency --- build.gradle | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- play-services-api/build.gradle | 9 +++++---- play-services-api/src/main/AndroidManifest.xml | 18 ------------------ play-services-base-api/build.gradle | 5 +++-- .../src/main/AndroidManifest.xml | 6 ------ play-services-base-core/build.gradle | 6 +++--- .../src/main/AndroidManifest.xml | 2 +- play-services-base/build.gradle | 5 +++-- .../src/main/AndroidManifest.xml | 3 +-- play-services-basement/build.gradle | 9 +++++---- .../src/main/AndroidManifest.xml | 18 ------------------ play-services-core-proto/build.gradle | 4 ++-- play-services-core/build.gradle | 15 +++++++++------ .../microg-ui-tools/build.gradle | 10 +++++----- .../src/main/AndroidManifest.xml | 18 ------------------ play-services-iid-api/build.gradle | 5 +++-- .../src/main/AndroidManifest.xml | 18 ------------------ play-services-tasks/build.gradle | 5 +++-- .../src/main/AndroidManifest.xml | 7 ------- 20 files changed, 52 insertions(+), 129 deletions(-) delete mode 100644 play-services-api/src/main/AndroidManifest.xml delete mode 100644 play-services-base-api/src/main/AndroidManifest.xml delete mode 100644 play-services-basement/src/main/AndroidManifest.xml delete mode 100644 play-services-core/microg-ui-tools/src/main/AndroidManifest.xml delete mode 100644 play-services-iid-api/src/main/AndroidManifest.xml delete mode 100644 play-services-tasks/src/main/AndroidManifest.xml diff --git a/build.gradle b/build.gradle index cdf74079..14866a3d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,27 +4,27 @@ */ buildscript { - ext.kotlinVersion = '1.7.20' + ext.kotlinVersion = '1.8.0' ext.coroutineVersion = '1.6.4' - ext.annotationVersion = '1.5.0' - ext.appcompatVersion = '1.5.1' + ext.annotationVersion = '1.6.0' + ext.appcompatVersion = '1.6.1' ext.coreVersion = '1.9.0' ext.collectionVersion = '1.3.0-dev01' ext.fragmentVersion = '1.5.5' ext.lifecycleVersion = '2.5.1' - ext.materialVersion = '1.7.0' + ext.materialVersion = '1.8.0' ext.navigationVersion = '2.5.3' ext.preferenceVersion = '1.2.0' - ext.webkitVersion = '1.5.0' + ext.webkitVersion = '1.6.0' ext.circleimageviewVersion = '3.1.0' ext.volleyVersion = '1.2.1' - ext.wireVersion = '4.4.3' + ext.wireVersion = '4.5.1' - ext.androidBuildGradleVersion = '7.3.1' - ext.androidBuildVersionTools = '33.0.1' + ext.androidBuildGradleVersion = '7.4.2' + ext.androidBuildVersionTools = '33.0.2' ext.androidMinSdk = 23 ext.androidTargetSdk = 29 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d38c612c..a6d7053a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Dec 22 22:27:19 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle index e254f48d..7746f3d3 100644 --- a/play-services-api/build.gradle +++ b/play-services-api/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion androidCompileSdk - buildToolsVersion androidBuildVersionTools + compileSdk androidCompileSdk + buildToolsVersion '33.0.2' defaultConfig { minSdkVersion androidMinSdk @@ -26,9 +26,10 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } + namespace 'org.microg.gms.api' } dependencies { diff --git a/play-services-api/src/main/AndroidManifest.xml b/play-services-api/src/main/AndroidManifest.xml deleted file mode 100644 index d4a4d07a..00000000 --- a/play-services-api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/play-services-base-api/build.gradle b/play-services-base-api/build.gradle index b806da4c..85eefbc3 100644 --- a/play-services-base-api/build.gradle +++ b/play-services-base-api/build.gradle @@ -34,7 +34,8 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } + namespace 'org.microg.gms.base.api' } \ No newline at end of file diff --git a/play-services-base-api/src/main/AndroidManifest.xml b/play-services-base-api/src/main/AndroidManifest.xml deleted file mode 100644 index 7c8eeef3..00000000 --- a/play-services-base-api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/play-services-base-core/build.gradle b/play-services-base-core/build.gradle index a0849ff8..48a2cb92 100644 --- 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 } @@ -31,7 +30,8 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } + namespace 'org.microg.gms.base.core' } \ No newline at end of file diff --git a/play-services-base-core/src/main/AndroidManifest.xml b/play-services-base-core/src/main/AndroidManifest.xml index de583c4d..6585028c 100644 --- a/play-services-base-core/src/main/AndroidManifest.xml +++ b/play-services-base-core/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ ~ SPDX-FileCopyrightText: 2020, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + - + - - - diff --git a/play-services-core-proto/build.gradle b/play-services-core-proto/build.gradle index 2cfb351e..bc080aaa 100644 --- 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 = 11 } compileTestKotlin { - kotlinOptions.jvmTarget = 1.8 + kotlinOptions.jvmTarget = 11 } \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index a1232546..f8cedad1 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -75,9 +75,6 @@ android { } } - lintOptions { - disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'Range' - } buildTypes { release { @@ -87,16 +84,22 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } packagingOptions { - exclude 'META-INF/ASL2.0' jniLibs { useLegacyPackaging false } + resources { + excludes += ['META-INF/ASL2.0'] + } } + lint { + disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'Range' + } + namespace 'com.mgoogle.android.gms' } if (file('user.gradle').exists()) { diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle index d0dbd48f..d9a5c2bb 100644 --- a/play-services-core/microg-ui-tools/build.gradle +++ b/play-services-core/microg-ui-tools/build.gradle @@ -26,14 +26,14 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } - - lintOptions { - // TODO: Remove MissingTranslation once we have stable strings and proper translations. + lint { disable 'MissingTranslation' } + namespace 'org.microg.tools.ui' + } dependencies { diff --git a/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml b/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml deleted file mode 100644 index 004f299c..00000000 --- a/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle index 603c53b4..0a786ab5 100644 --- a/play-services-iid-api/build.gradle +++ b/play-services-iid-api/build.gradle @@ -26,9 +26,10 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } + namespace 'org.microg.gms.iid.api' } dependencies { diff --git a/play-services-iid-api/src/main/AndroidManifest.xml b/play-services-iid-api/src/main/AndroidManifest.xml deleted file mode 100644 index e979258e..00000000 --- a/play-services-iid-api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - \ No newline at end of file diff --git a/play-services-tasks/build.gradle b/play-services-tasks/build.gradle index 0eb84bbf..204e8d9e 100644 --- a/play-services-tasks/build.gradle +++ b/play-services-tasks/build.gradle @@ -22,9 +22,10 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } + namespace 'org.microg.gms.tasks' } dependencies { diff --git a/play-services-tasks/src/main/AndroidManifest.xml b/play-services-tasks/src/main/AndroidManifest.xml deleted file mode 100644 index c7b833fe..00000000 --- a/play-services-tasks/src/main/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - -