diff --git a/build.gradle b/build.gradle index 46ac24a6f1..31ee5a0fef 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.cronetVersion = '102.5005.125' ext.wearableVersion = '0.1.1' - ext.kotlinVersion = '1.7.10' + ext.kotlinVersion = '1.7.22' ext.coroutineVersion = '1.6.4' ext.annotationVersion = '1.5.0' @@ -26,11 +26,11 @@ buildscript { ext.slf4jVersion = '1.7.36' ext.volleyVersion = '1.2.1' - ext.wireVersion = '4.4.1' + ext.wireVersion = '4.8.0' - ext.androidBuildGradleVersion = '7.2.1' + ext.androidBuildGradleVersion = '8.0.2' - ext.androidBuildVersionTools = '33.0.0' + ext.androidBuildVersionTools = '33.0.1' ext.androidMinSdk = 14 ext.androidTargetSdk = 29 @@ -53,7 +53,6 @@ buildscript { classpath "com.android.tools.build:gradle:$androidBuildGradleVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion" - classpath "com.github.kezong:fat-aar:1.3.8" } } diff --git a/firebase-auth/build.gradle b/firebase-auth/build.gradle index bb8662f85a..badda96557 100644 --- a/firebase-auth/build.gradle +++ b/firebase-auth/build.gradle @@ -6,9 +6,14 @@ apply plugin: 'com.android.library' android { + namespace 'com.google.firebase.auth' compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/firebase-auth/core/build.gradle b/firebase-auth/core/build.gradle index 6fe5434679..974e386ffd 100644 --- a/firebase-auth/core/build.gradle +++ b/firebase-auth/core/build.gradle @@ -24,6 +24,8 @@ dependencies { } android { + namespace "org.microg.gms.firebase.auth.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -41,4 +43,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/firebase-auth/core/src/main/AndroidManifest.xml b/firebase-auth/core/src/main/AndroidManifest.xml index d350779399..b684a0c298 100644 --- a/firebase-auth/core/src/main/AndroidManifest.xml +++ b/firebase-auth/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2020, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/firebase-auth/core/src/main/kotlin/org/microg/gms/firebase/auth/IdentityToolkitClient.kt b/firebase-auth/core/src/main/kotlin/org/microg/gms/firebase/auth/IdentityToolkitClient.kt index 68021a7621..64778da496 100644 --- a/firebase-auth/core/src/main/kotlin/org/microg/gms/firebase/auth/IdentityToolkitClient.kt +++ b/firebase-auth/core/src/main/kotlin/org/microg/gms/firebase/auth/IdentityToolkitClient.kt @@ -95,7 +95,7 @@ class IdentityToolkitClient(context: Context, private val apiKey: String, privat .put("password", password) .put("displayName", displayName) .put("photoUrl", photoUrl) - .put("deleteAttribute", JSONArray().apply { deleteAttribute.forEach { put(it) } })) + .put("deleteAttribute", JSONArray().apply { deleteAttribute.map { put(it) } })) suspend fun signupNewUser(email: String? = null, password: String? = null, tenantId: String? = null): JSONObject = request("signupNewUser", JSONObject() diff --git a/firebase-auth/src/main/AndroidManifest.xml b/firebase-auth/src/main/AndroidManifest.xml index 95249c36de..c256eb4492 100644 --- a/firebase-auth/src/main/AndroidManifest.xml +++ b/firebase-auth/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/firebase-dynamic-links-api/build.gradle b/firebase-dynamic-links/build.gradle similarity index 89% rename from firebase-dynamic-links-api/build.gradle rename to firebase-dynamic-links/build.gradle index 7cb477472a..f28795f50e 100644 --- a/firebase-dynamic-links-api/build.gradle +++ b/firebase-dynamic-links/build.gradle @@ -9,9 +9,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.firebase.dynamiclinks" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/firebase-dynamic-links-api/src/main/AndroidManifest.xml b/firebase-dynamic-links/src/main/AndroidManifest.xml similarity index 91% rename from firebase-dynamic-links-api/src/main/AndroidManifest.xml rename to firebase-dynamic-links/src/main/AndroidManifest.xml index ae17555c5d..b6845e5d54 100644 --- a/firebase-dynamic-links-api/src/main/AndroidManifest.xml +++ b/firebase-dynamic-links/src/main/AndroidManifest.xml @@ -15,4 +15,4 @@ ~ limitations under the License. --> - + diff --git a/firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/DynamicLinkData.aidl b/firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/DynamicLinkData.aidl similarity index 100% rename from firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/DynamicLinkData.aidl rename to firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/DynamicLinkData.aidl diff --git a/firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksCallbacks.aidl b/firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksCallbacks.aidl similarity index 100% rename from firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksCallbacks.aidl rename to firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksCallbacks.aidl diff --git a/firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksService.aidl b/firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksService.aidl similarity index 100% rename from firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksService.aidl rename to firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksService.aidl diff --git a/firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.aidl b/firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.aidl similarity index 100% rename from firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.aidl rename to firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.aidl diff --git a/firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/WarningImpl.aidl b/firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/WarningImpl.aidl similarity index 100% rename from firebase-dynamic-links-api/src/main/aidl/com/google/firebase/dynamiclinks/internal/WarningImpl.aidl rename to firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/WarningImpl.aidl diff --git a/firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/ShortDynamicLink.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/ShortDynamicLink.java similarity index 100% rename from firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/ShortDynamicLink.java rename to firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/ShortDynamicLink.java diff --git a/firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java similarity index 100% rename from firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java rename to firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java diff --git a/firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.java similarity index 100% rename from firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.java rename to firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.java diff --git a/firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/internal/WarningImpl.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/WarningImpl.java similarity index 100% rename from firebase-dynamic-links-api/src/main/java/com/google/firebase/dynamiclinks/internal/WarningImpl.java rename to firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/WarningImpl.java diff --git a/gradle.properties b/gradle.properties index 976747dab4..c1cbc518a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,2 @@ android.useAndroidX=true -android.disableAutomaticComponentCreation=true -org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC +org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 365ac247b1..e59574a340 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/play-services-ads-base/build.gradle b/play-services-ads-base/build.gradle index c270c2279f..bb5ae3dc9c 100644 --- a/play-services-ads-base/build.gradle +++ b/play-services-ads-base/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.ads_base" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-ads-base/src/main/AndroidManifest.xml b/play-services-ads-base/src/main/AndroidManifest.xml index dd01f9f11f..7f3bbf275c 100644 --- a/play-services-ads-base/src/main/AndroidManifest.xml +++ b/play-services-ads-base/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-ads-identifier/build.gradle b/play-services-ads-identifier/build.gradle index 83d509f7a8..9c5a4d82db 100644 --- a/play-services-ads-identifier/build.gradle +++ b/play-services-ads-identifier/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.ads.identifier" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-ads-identifier/core/build.gradle b/play-services-ads-identifier/core/build.gradle index bf27c84d20..9a2b7c8e4d 100644 --- a/play-services-ads-identifier/core/build.gradle +++ b/play-services-ads-identifier/core/build.gradle @@ -12,6 +12,8 @@ dependencies { } android { + namespace "org.microg.gms.ads.identifier" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -30,6 +32,10 @@ android { targetCompatibility = 1.8 } + kotlinOptions { + jvmTarget = 1.8 + } + lintOptions { disable 'MissingTranslation' } diff --git a/play-services-ads-identifier/core/src/main/AndroidManifest.xml b/play-services-ads-identifier/core/src/main/AndroidManifest.xml index 4f4c53e031..b97bc37b2b 100644 --- a/play-services-ads-identifier/core/src/main/AndroidManifest.xml +++ b/play-services-ads-identifier/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-ads-identifier/src/main/AndroidManifest.xml b/play-services-ads-identifier/src/main/AndroidManifest.xml index 266de1f1ec..7f3bbf275c 100644 --- a/play-services-ads-identifier/src/main/AndroidManifest.xml +++ b/play-services-ads-identifier/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-ads-lite/build.gradle b/play-services-ads-lite/build.gradle index f3bb5a485d..1c8dbe17a8 100644 --- a/play-services-ads-lite/build.gradle +++ b/play-services-ads-lite/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.ads" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-ads-lite/core/build.gradle b/play-services-ads-lite/core/build.gradle index 1725ce8baa..4c4832ef5e 100644 --- a/play-services-ads-lite/core/build.gradle +++ b/play-services-ads-lite/core/build.gradle @@ -12,6 +12,8 @@ dependencies { } android { + namespace "org.microg.gms.ads" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -29,4 +31,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/play-services-ads-lite/core/src/main/AndroidManifest.xml b/play-services-ads-lite/core/src/main/AndroidManifest.xml index 8172918c78..a9ef4935e1 100644 --- a/play-services-ads-lite/core/src/main/AndroidManifest.xml +++ b/play-services-ads-lite/core/src/main/AndroidManifest.xml @@ -3,6 +3,5 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-ads-lite/src/main/AndroidManifest.xml b/play-services-ads-lite/src/main/AndroidManifest.xml index 45aedac2dd..1b55c5b813 100644 --- a/play-services-ads-lite/src/main/AndroidManifest.xml +++ b/play-services-ads-lite/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-ads/build.gradle b/play-services-ads/build.gradle index a51316f42b..34c044799b 100644 --- a/play-services-ads/build.gradle +++ b/play-services-ads/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.ads.impl" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-ads/core/build.gradle b/play-services-ads/core/build.gradle index c4293cad2d..c9beaf9503 100644 --- a/play-services-ads/core/build.gradle +++ b/play-services-ads/core/build.gradle @@ -14,6 +14,8 @@ dependencies { } android { + namespace "org.microg.gms.ads.impl" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -31,4 +33,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/play-services-ads/core/src/main/AndroidManifest.xml b/play-services-ads/core/src/main/AndroidManifest.xml index 3b9a89d17f..78f153d567 100644 --- a/play-services-ads/core/src/main/AndroidManifest.xml +++ b/play-services-ads/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-ads/src/main/AndroidManifest.xml b/play-services-ads/src/main/AndroidManifest.xml index fc70b763e1..2a578f738e 100644 --- a/play-services-ads/src/main/AndroidManifest.xml +++ b/play-services-ads/src/main/AndroidManifest.xml @@ -4,7 +4,6 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle index 2cbc97591c..6512e6204c 100644 --- a/play-services-api/build.gradle +++ b/play-services-api/build.gradle @@ -17,9 +17,15 @@ apply plugin: 'com.android.library' android { + namespace "org.microg.gms.api" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-api/src/main/AndroidManifest.xml b/play-services-api/src/main/AndroidManifest.xml index d4a4d07a2f..359a9b7122 100644 --- a/play-services-api/src/main/AndroidManifest.xml +++ b/play-services-api/src/main/AndroidManifest.xml @@ -15,4 +15,4 @@ ~ limitations under the License. --> - + diff --git a/play-services-appinvite/build.gradle b/play-services-appinvite/build.gradle index e4a052b87c..492a74263f 100644 --- a/play-services-appinvite/build.gradle +++ b/play-services-appinvite/build.gradle @@ -19,9 +19,15 @@ apply plugin: 'com.android.library' group = 'org.microg' android { + namespace "com.google.android.gms.appinvite" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-appinvite/core/build.gradle b/play-services-appinvite/core/build.gradle index e62ae85533..95f3dadb7f 100644 --- a/play-services-appinvite/core/build.gradle +++ b/play-services-appinvite/core/build.gradle @@ -14,6 +14,8 @@ dependencies { } android { + namespace "org.microg.gms.appinvite" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -31,4 +33,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/play-services-appinvite/core/src/main/AndroidManifest.xml b/play-services-appinvite/core/src/main/AndroidManifest.xml index c1cfe3f864..e8ab75d4cf 100644 --- a/play-services-appinvite/core/src/main/AndroidManifest.xml +++ b/play-services-appinvite/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - diff --git a/play-services-appinvite/src/main/AndroidManifest.xml b/play-services-appinvite/src/main/AndroidManifest.xml index 86039165e1..b6845e5d54 100644 --- a/play-services-appinvite/src/main/AndroidManifest.xml +++ b/play-services-appinvite/src/main/AndroidManifest.xml @@ -15,4 +15,4 @@ ~ limitations under the License. --> - + diff --git a/play-services-auth-api-phone/build.gradle b/play-services-auth-api-phone/build.gradle index 9da5db841c..7cb31bdac4 100644 --- a/play-services-auth-api-phone/build.gradle +++ b/play-services-auth-api-phone/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.auth.api.phone" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-auth-api-phone/src/main/AndroidManifest.xml b/play-services-auth-api-phone/src/main/AndroidManifest.xml index c8ff378e80..fe3a9e6548 100644 --- a/play-services-auth-api-phone/src/main/AndroidManifest.xml +++ b/play-services-auth-api-phone/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2023 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-auth-base/build.gradle b/play-services-auth-base/build.gradle index 485e882457..92ed11c76a 100644 --- a/play-services-auth-base/build.gradle +++ b/play-services-auth-base/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.auth" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-auth-base/src/main/AndroidManifest.xml b/play-services-auth-base/src/main/AndroidManifest.xml index 838878b379..271ae97e2b 100644 --- a/play-services-auth-base/src/main/AndroidManifest.xml +++ b/play-services-auth-base/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-auth/build.gradle b/play-services-auth/build.gradle index b828427049..d95c5fa5c6 100644 --- a/play-services-auth/build.gradle +++ b/play-services-auth/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.auth.api" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-auth/src/main/AndroidManifest.xml b/play-services-auth/src/main/AndroidManifest.xml index 43abf3842d..271ae97e2b 100644 --- a/play-services-auth/src/main/AndroidManifest.xml +++ b/play-services-auth/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle index 2eba04081d..fa6e4744f7 100644 --- a/play-services-base/build.gradle +++ b/play-services-base/build.gradle @@ -19,12 +19,18 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.base" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" - aidlPackageWhiteList "com/google/android/gms/common/data/DataHolder.aidl" - aidlPackageWhiteList "com/google/android/gms/common/images/WebImage.aidl" - aidlPackageWhiteList "com/google/android/gms/common/api/internal/IStatusCallback.aidl" + aidlPackagedList "com/google/android/gms/common/data/DataHolder.aidl" + aidlPackagedList "com/google/android/gms/common/images/WebImage.aidl" + aidlPackagedList "com/google/android/gms/common/api/internal/IStatusCallback.aidl" + + buildFeatures { + aidl = true + } defaultConfig { versionName version diff --git a/play-services-base/core/build.gradle b/play-services-base/core/build.gradle index c87165d86a..055c85b381 100644 --- a/play-services-base/core/build.gradle +++ b/play-services-base/core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -23,6 +22,8 @@ dependencies { } android { + namespace "org.microg.gms.base.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -45,6 +46,10 @@ android { targetCompatibility = 1.8 } + kotlinOptions { + jvmTarget = 1.8 + } + lintOptions { disable 'MissingTranslation' } diff --git a/play-services-base/core/src/main/AndroidManifest.xml b/play-services-base/core/src/main/AndroidManifest.xml index 9ae3d128ac..aebc21a461 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 --> - + getSettings(context: Context, uri: Uri, projection: Array?, f: (Cursor) -> T): T = withoutCallingIdentity { - context.contentResolver.query(uri, projection, null, null, null).use { c -> + val c = context.contentResolver.query(uri, projection, null, null, null) + try { require(c != null) { "Cursor for query $uri ${projection?.toList()} was null" } if (!c.moveToFirst()) error("Cursor for query $uri ${projection?.toList()} was empty") f.invoke(c) + } finally { + c?.close() } } diff --git a/play-services-base/src/main/AndroidManifest.xml b/play-services-base/src/main/AndroidManifest.xml index 35b97ae7f0..e987626e3c 100644 --- a/play-services-base/src/main/AndroidManifest.xml +++ b/play-services-base/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index 6a52857805..41f4a76417 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -26,14 +26,21 @@ dependencies { } android { + namespace "com.google.android.gms.common" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" - aidlPackageWhiteList "com/google/android/gms/common/api/Status.aidl" - aidlPackageWhiteList "com/google/android/gms/common/internal/IAccountAccessor.aidl" - aidlPackageWhiteList "com/google/android/gms/common/internal/ICancelToken.aidl" - aidlPackageWhiteList "com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl" - aidlPackageWhiteList "com/google/android/gms/dynamic/IObjectWrapper.aidl" + aidlPackagedList "com/google/android/gms/common/api/Status.aidl" + aidlPackagedList "com/google/android/gms/common/internal/IAccountAccessor.aidl" + aidlPackagedList "com/google/android/gms/common/internal/ICancelToken.aidl" + aidlPackagedList "com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl" + aidlPackagedList "com/google/android/gms/dynamic/IObjectWrapper.aidl" + + buildFeatures { + aidl = true + buildConfig = true + } defaultConfig { versionName version diff --git a/play-services-basement/ktx/build.gradle b/play-services-basement/ktx/build.gradle index 5bf42aa0d1..63e613bcbb 100644 --- a/play-services-basement/ktx/build.gradle +++ b/play-services-basement/ktx/build.gradle @@ -14,6 +14,8 @@ dependencies { } android { + namespace "org.microg.gms.basement.ktx" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -31,6 +33,10 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } apply from: '../../gradle/publish-android.gradle' diff --git a/play-services-basement/ktx/src/main/AndroidManifest.xml b/play-services-basement/ktx/src/main/AndroidManifest.xml index 1380d1994d..870618f4ae 100644 --- a/play-services-basement/ktx/src/main/AndroidManifest.xml +++ b/play-services-basement/ktx/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-basement/src/main/AndroidManifest.xml b/play-services-basement/src/main/AndroidManifest.xml index c7a78a1b5d..eea8da7ff5 100644 --- a/play-services-basement/src/main/AndroidManifest.xml +++ b/play-services-basement/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + void writeObject(T object, Parcel parcel, int flags, ClassDescriptor descriptor) { int start = SafeParcelWriter.writeObjectHeader(parcel); - for (int i = 0; i < descriptor.fields.size(); i++) { - ClassDescriptor.FieldDescriptor fieldDescriptor = descriptor.fields.valueAt(i); + for (ClassDescriptor.FieldDescriptor fieldDescriptor : descriptor.fields.values()) { try { writeField(object, parcel, flags, fieldDescriptor); } catch (Exception e) { @@ -393,7 +392,7 @@ private enum SafeParcelType { public static class ClassDescriptor { Class tClass; Constructor constructor; - SparseArray fields = new SparseArray<>(); + Map fields = new HashMap<>(); public ClassDescriptor(Class tClass) { this.tClass = tClass; @@ -408,7 +407,7 @@ public ClassDescriptor(Class tClass) { for (Field field : clazz.getDeclaredFields()) { if (isSafeParceledField(field)) { FieldDescriptor fieldDescriptor = new FieldDescriptor(field); - fields.set(fieldDescriptor.id, fieldDescriptor); + fields.put(fieldDescriptor.id, fieldDescriptor); } } clazz = clazz.getSuperclass(); diff --git a/play-services-cast-framework/build.gradle b/play-services-cast-framework/build.gradle index 94ab3b69a6..267c69ac90 100644 --- a/play-services-cast-framework/build.gradle +++ b/play-services-cast-framework/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.cast.framework" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-cast-framework/core/build.gradle b/play-services-cast-framework/core/build.gradle index 988f118137..828c26f087 100644 --- a/play-services-cast-framework/core/build.gradle +++ b/play-services-cast-framework/core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -19,6 +18,8 @@ dependencies { } android { + namespace "org.microg.gms.cast.framework.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-cast-framework/core/src/main/AndroidManifest.xml b/play-services-cast-framework/core/src/main/AndroidManifest.xml index ee3ec94f7b..9df69b73bd 100644 --- a/play-services-cast-framework/core/src/main/AndroidManifest.xml +++ b/play-services-cast-framework/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-cast-framework/src/main/AndroidManifest.xml b/play-services-cast-framework/src/main/AndroidManifest.xml index e6bdc80529..4fddd28710 100644 --- a/play-services-cast-framework/src/main/AndroidManifest.xml +++ b/play-services-cast-framework/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-cast/build.gradle b/play-services-cast/build.gradle index 1deb9f18ca..044cc65576 100644 --- a/play-services-cast/build.gradle +++ b/play-services-cast/build.gradle @@ -8,11 +8,17 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.cast" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" - aidlPackageWhiteList "com/google/android/gms/cast/ApplicationMetadata.aidl" - aidlPackageWhiteList "com/google/android/gms/cast/LaunchOptions.aidl" + aidlPackagedList "com/google/android/gms/cast/ApplicationMetadata.aidl" + aidlPackagedList "com/google/android/gms/cast/LaunchOptions.aidl" + + buildFeatures { + aidl = true + } defaultConfig { versionName version diff --git a/play-services-cast/core/build.gradle b/play-services-cast/core/build.gradle index 3cf9fd733c..787acccc56 100644 --- a/play-services-cast/core/build.gradle +++ b/play-services-cast/core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -24,6 +23,8 @@ dependencies { } android { + namespace "org.microg.gms.cast.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-cast/core/src/main/AndroidManifest.xml b/play-services-cast/core/src/main/AndroidManifest.xml index 699dafdfd9..f25508e6ae 100644 --- a/play-services-cast/core/src/main/AndroidManifest.xml +++ b/play-services-cast/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-cast/src/main/AndroidManifest.xml b/play-services-cast/src/main/AndroidManifest.xml index a305346394..359a9b7122 100644 --- a/play-services-cast/src/main/AndroidManifest.xml +++ b/play-services-cast/src/main/AndroidManifest.xml @@ -15,4 +15,4 @@ ~ limitations under the License. --> - + diff --git a/play-services-chimera-core/build.gradle b/play-services-chimera-core/build.gradle index d70a72c2e0..3001708db6 100644 --- a/play-services-chimera-core/build.gradle +++ b/play-services-chimera-core/build.gradle @@ -17,6 +17,8 @@ dependencies { } android { + namespace "org.microg.gms.chimera.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -34,6 +36,10 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } apply from: '../gradle/publish-android.gradle' diff --git a/play-services-chimera-core/src/main/AndroidManifest.xml b/play-services-chimera-core/src/main/AndroidManifest.xml index ffeb76d694..6d65d89c09 100644 --- a/play-services-chimera-core/src/main/AndroidManifest.xml +++ b/play-services-chimera-core/src/main/AndroidManifest.xml @@ -3,6 +3,6 @@ ~ SPDX-FileCopyrightText: 2021, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-clearcut/build.gradle b/play-services-clearcut/build.gradle index 0cf2d5241b..282c0105de 100644 --- a/play-services-clearcut/build.gradle +++ b/play-services-clearcut/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.clearcut" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-clearcut/src/main/AndroidManifest.xml b/play-services-clearcut/src/main/AndroidManifest.xml index a471bed7a7..271ae97e2b 100644 --- a/play-services-clearcut/src/main/AndroidManifest.xml +++ b/play-services-clearcut/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-conscrypt-provider-core/build.gradle b/play-services-conscrypt-provider-core/build.gradle index c8a510b714..628b2c63f3 100644 --- a/play-services-conscrypt-provider-core/build.gradle +++ b/play-services-conscrypt-provider-core/build.gradle @@ -12,6 +12,8 @@ dependencies { } android { + namespace "org.microg.gms.core.conscrypt" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-conscrypt-provider-core/src/main/AndroidManifest.xml b/play-services-conscrypt-provider-core/src/main/AndroidManifest.xml index b06f1e9f4a..eeb0773d2d 100644 --- a/play-services-conscrypt-provider-core/src/main/AndroidManifest.xml +++ b/play-services-conscrypt-provider-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 68f2a91f62..f3f4a16b88 100644 --- a/play-services-core-proto/build.gradle +++ b/play-services-core-proto/build.gradle @@ -20,6 +20,11 @@ sourceSets { main.java.srcDirs += "$buildDir/generated/source/wire" } +compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} + compileKotlin { kotlinOptions.jvmTarget = 1.8 } diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index f3aaae36df..70c111136b 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' configurations { withMapboxImplementation @@ -18,7 +17,7 @@ dependencies { implementation "com.squareup.wire:wire-runtime:$wireVersion" implementation "de.hdodenhof:circleimageview:1.3.0" - implementation project(':firebase-dynamic-links-api') + implementation project(':firebase-dynamic-links') implementation project(':firebase-auth-core') implementation project(':play-services-ads-core') implementation project(':play-services-ads-identifier-core') @@ -82,9 +81,15 @@ dependencies { } android { + namespace "com.google.android.gms" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + buildConfig = true + } + defaultConfig { versionName version versionCode appVersionCode @@ -157,6 +162,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = 1.8 + } + packagingOptions { exclude 'META-INF/ASL2.0' jniLibs { diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle index d1479ecf42..05126d0abb 100644 --- a/play-services-core/microg-ui-tools/build.gradle +++ b/play-services-core/microg-ui-tools/build.gradle @@ -17,6 +17,8 @@ apply plugin: 'com.android.library' android { + namespace "org.microg.tools.ui" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml b/play-services-core/microg-ui-tools/src/main/AndroidManifest.xml index 004f299cbe..359a9b7122 100644 --- 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. --> - + diff --git a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java index e45d38123e..e451ad2ee1 100644 --- a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java +++ b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java @@ -36,7 +36,7 @@ public RadioButtonPreference(Context context, AttributeSet attrs, int defStyleAt @SuppressLint("RestrictedApi") public RadioButtonPreference(Context context, AttributeSet attrs) { - this(context, attrs, TypedArrayUtils.getAttr(context, R.attr.checkBoxPreferenceStyle, + this(context, attrs, TypedArrayUtils.getAttr(context, androidx.preference.R.attr.checkBoxPreferenceStyle, android.R.attr.checkBoxPreferenceStyle)); } diff --git a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java index 2d63313d16..ff3abfa56b 100644 --- a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java +++ b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java @@ -72,7 +72,7 @@ public SwitchBar(Context context, AttributeSet attrs) { if (SDK_INT > 16) { mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); } - mLabel = getResources().getString(R.string.abc_capital_off); + mLabel = getResources().getString(androidx.appcompat.R.string.abc_capital_off); mSummarySpan = new TextAppearanceSpan(context, androidx.appcompat.R.style.TextAppearance_AppCompat_Widget_Switch); updateText(); @@ -99,7 +99,7 @@ public void onSwitchChanged(SwitchCompat switchView, boolean isChecked) { public void setTextViewLabel(boolean isChecked) { mLabel = getResources() - .getString(isChecked ? R.string.abc_capital_on : R.string.abc_capital_off); + .getString(isChecked ? androidx.appcompat.R.string.abc_capital_on : androidx.appcompat.R.string.abc_capital_off); updateText(); } diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 5ff4980dee..163447e121 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ ~ limitations under the License. --> + xmlns:tools="http://schemas.android.com/tools"> (PREF_ABOUT)!!.summary = getString(R.string.about_version_str, AboutFragment.getSelfVersion(context)) + findPreference(PREF_ABOUT)!!.summary = getString(org.microg.tools.ui.R.string.about_version_str, AboutFragment.getSelfVersion(context)) findPreference(PREF_EXPOSURE)?.isVisible = NearbyPreferencesIntegration.isAvailable findPreference(PREF_EXPOSURE)?.icon = NearbyPreferencesIntegration.getIcon(requireContext()) diff --git a/play-services-core/src/withNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt b/play-services-core/src/withNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt index 60a5029e0f..ddd84ed63a 100644 --- a/play-services-core/src/withNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt +++ b/play-services-core/src/withNearby/kotlin/org/microg/gms/ui/NearbyPreferencesIntegration.kt @@ -32,6 +32,6 @@ interface NearbyPreferencesIntegration { val isAvailable: Boolean = android.os.Build.VERSION.SDK_INT >= 21 - const val exposureNotificationNavigationId: Int = R.id.openExposureNotificationSettings + val exposureNotificationNavigationId: Int = R.id.openExposureNotificationSettings } } diff --git a/play-services-cronet/core/build.gradle b/play-services-cronet/core/build.gradle index 82e0cc695f..f1c2e69264 100644 --- a/play-services-cronet/core/build.gradle +++ b/play-services-cronet/core/build.gradle @@ -18,6 +18,8 @@ dependencies { } android { + namespace "org.microg.gms.net.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-cronet/core/src/main/AndroidManifest.xml b/play-services-cronet/core/src/main/AndroidManifest.xml index 93245ce886..44b095cfe7 100644 --- a/play-services-cronet/core/src/main/AndroidManifest.xml +++ b/play-services-cronet/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2021, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-drive/build.gradle b/play-services-drive/build.gradle index 5ec34464eb..3c42374551 100644 --- a/play-services-drive/build.gradle +++ b/play-services-drive/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.drive" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-drive/src/main/AndroidManifest.xml b/play-services-drive/src/main/AndroidManifest.xml index bd1652f25e..271ae97e2b 100644 --- a/play-services-drive/src/main/AndroidManifest.xml +++ b/play-services-drive/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-droidguard/build.gradle b/play-services-droidguard/build.gradle index 8cb77f47e2..a253811a4c 100644 --- a/play-services-droidguard/build.gradle +++ b/play-services-droidguard/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "org.microg.gms.droidguard" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-droidguard/core/build.gradle b/play-services-droidguard/core/build.gradle index d6c6d51d3d..e5835c02a2 100644 --- a/play-services-droidguard/core/build.gradle +++ b/play-services-droidguard/core/build.gradle @@ -31,9 +31,15 @@ wire { } android { + namespace "org.microg.gms.droidguard.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + buildConfig = true + } + defaultConfig { versionName "20.47.14" versionCode 204714000 diff --git a/play-services-droidguard/core/src/main/AndroidManifest.xml b/play-services-droidguard/core/src/main/AndroidManifest.xml index a8517e9a53..aa2a2ffe9f 100644 --- a/play-services-droidguard/core/src/main/AndroidManifest.xml +++ b/play-services-droidguard/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/DgDatabaseHelper.kt b/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/DgDatabaseHelper.kt index 169c3a03d8..7890b5f35b 100644 --- a/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/DgDatabaseHelper.kt +++ b/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/DgDatabaseHelper.kt @@ -35,12 +35,15 @@ class DgDatabaseHelper(context: Context) : SQLiteOpenHelper(context, "dg.db", nu */ fun get(id: String): Triple? = readableDatabase.use { db -> val time = System.currentTimeMillis() / 1000 - db.query("main", arrayOf("f", "d", "e", "c", "g"), "a = ? AND b <= $time AND $time < (b + c)", arrayOf(id), null, null, "b DESC", "1").use { + val it = db.query("main", arrayOf("f", "d", "e", "c", "g"), "a = ? AND b <= $time AND $time < (b + c)", arrayOf(id), null, null, "b DESC", "1") + try { if (it.moveToNext()) { Triple(it.getString(1), it.getBlob(0), it.getBlob(4)) } else { null } + } finally { + it.close() } } diff --git a/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/ui/DroidGuardPreferencesFragment.kt b/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/ui/DroidGuardPreferencesFragment.kt index 22ac9dbbad..1bdffb0562 100644 --- a/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/ui/DroidGuardPreferencesFragment.kt +++ b/play-services-droidguard/core/src/main/kotlin/org/microg/gms/droidguard/core/ui/DroidGuardPreferencesFragment.kt @@ -13,8 +13,8 @@ import org.microg.gms.droidguard.core.DroidGuardPreferences import org.microg.gms.droidguard.core.DroidGuardPreferences.Mode.Embedded import org.microg.gms.droidguard.core.DroidGuardPreferences.Mode.Network import org.microg.gms.droidguard.core.R -import org.microg.gms.droidguard.core.R.drawable.ic_radio_checked -import org.microg.gms.droidguard.core.R.drawable.ic_radio_unchecked +import org.microg.gms.base.core.R.drawable.ic_radio_checked +import org.microg.gms.base.core.R.drawable.ic_radio_unchecked class DroidGuardPreferencesFragment : PreferenceFragmentCompat() { private lateinit var modeEmbedded: Preference diff --git a/play-services-droidguard/src/main/AndroidManifest.xml b/play-services-droidguard/src/main/AndroidManifest.xml index 4d4b7873d7..c256eb4492 100644 --- a/play-services-droidguard/src/main/AndroidManifest.xml +++ b/play-services-droidguard/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-fido/build.gradle b/play-services-fido/build.gradle index 9fadc6648a..b1fdfd39a9 100644 --- a/play-services-fido/build.gradle +++ b/play-services-fido/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.fido" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-fido/core/build.gradle b/play-services-fido/core/build.gradle index b8414fb45e..babf3419ba 100644 --- a/play-services-fido/core/build.gradle +++ b/play-services-fido/core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -36,6 +35,8 @@ dependencies { } android { + namespace "org.microg.gms.fido.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-fido/core/src/main/AndroidManifest.xml b/play-services-fido/core/src/main/AndroidManifest.xml index de9335649c..233aaeae2b 100644 --- a/play-services-fido/core/src/main/AndroidManifest.xml +++ b/play-services-fido/core/src/main/AndroidManifest.xml @@ -5,8 +5,7 @@ --> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/Database.kt b/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/Database.kt index 37fc022438..377f2d11b0 100644 --- a/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/Database.kt +++ b/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/Database.kt @@ -23,8 +23,11 @@ class Database(context: Context) : SQLiteOpenHelper(context, "fido.db", null, VE fun wasUsed(): Boolean = readableDatabase.use { it.count(TABLE_KNOWN_REGISTRATIONS) > 0 } fun getKnownRegistrationTransport(rpId: String, credentialId: String) = readableDatabase.use { - it.query(TABLE_KNOWN_REGISTRATIONS, arrayOf(COLUMN_TRANSPORT), "$COLUMN_RP_ID = ? AND $COLUMN_CREDENTIAL_ID = ?", arrayOf(rpId, credentialId), null, null, null).use { - if (it.moveToFirst()) Transport.valueOf(it.getString(0)) else null + val c = it.query(TABLE_KNOWN_REGISTRATIONS, arrayOf(COLUMN_TRANSPORT), "$COLUMN_RP_ID = ? AND $COLUMN_CREDENTIAL_ID = ?", arrayOf(rpId, credentialId), null, null, null) + try { + if (c.moveToFirst()) Transport.valueOf(c.getString(0)) else null + } finally { + c.close() } } @@ -71,15 +74,19 @@ class Database(context: Context) : SQLiteOpenHelper(context, "fido.db", null, VE } } -fun SQLiteDatabase.count(table: String, selection: String? = null, vararg selectionArgs: String) = - if (selection == null) { +fun SQLiteDatabase.count(table: String, selection: String? = null, vararg selectionArgs: String): Long { + val it = if (selection == null) { rawQuery("SELECT COUNT(*) FROM $table", null) } else { rawQuery("SELECT COUNT(*) FROM $table WHERE $selection", selectionArgs) - }.use { + } + return try { if (it.moveToFirst()) { it.getLongOrNull(0) ?: 0 } else { 0 } + } finally { + it.close() } +} \ No newline at end of file diff --git a/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/ui/AuthenticatorActivity.kt b/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/ui/AuthenticatorActivity.kt index 1f1b79b7d8..8391c71ebd 100644 --- a/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/ui/AuthenticatorActivity.kt +++ b/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/ui/AuthenticatorActivity.kt @@ -107,7 +107,7 @@ class AuthenticatorActivity : AppCompatActivity(), TransportHandlerCallback { } } - setTheme(R.style.Theme_AppCompat_DayNight_NoActionBar) + setTheme(androidx.appcompat.R.style.Theme_AppCompat_DayNight_NoActionBar) setContentView(R.layout.fido_authenticator_activity) lifecycleScope.launchWhenCreated { diff --git a/play-services-fido/src/main/AndroidManifest.xml b/play-services-fido/src/main/AndroidManifest.xml index 2c6c2f9a92..ca41ba7c7f 100644 --- a/play-services-fido/src/main/AndroidManifest.xml +++ b/play-services-fido/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-gcm/build.gradle b/play-services-gcm/build.gradle index 12bd89c56f..60c68023f8 100644 --- a/play-services-gcm/build.gradle +++ b/play-services-gcm/build.gradle @@ -6,6 +6,8 @@ apply plugin: 'com.android.library' android { + namespace "com.google.android.gms.gcm" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-gcm/src/main/AndroidManifest.xml b/play-services-gcm/src/main/AndroidManifest.xml index 71c6fcd4cf..31cd4d453a 100644 --- a/play-services-gcm/src/main/AndroidManifest.xml +++ b/play-services-gcm/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + diff --git a/play-services-gmscompliance/build.gradle b/play-services-gmscompliance/build.gradle index 3e12f9b795..fc5ed950bf 100644 --- a/play-services-gmscompliance/build.gradle +++ b/play-services-gmscompliance/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "org.microg.gms.gmscompliance.api" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-gmscompliance/core/build.gradle b/play-services-gmscompliance/core/build.gradle index 9cbc82ba1c..1f278e32e8 100644 --- a/play-services-gmscompliance/core/build.gradle +++ b/play-services-gmscompliance/core/build.gradle @@ -26,6 +26,8 @@ dependencies { } android { + namespace "org.microg.gms.gmscompliance.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-gmscompliance/core/src/main/AndroidManifest.xml b/play-services-gmscompliance/core/src/main/AndroidManifest.xml index e0fa91b5f4..b6ad5b3b06 100644 --- a/play-services-gmscompliance/core/src/main/AndroidManifest.xml +++ b/play-services-gmscompliance/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-gmscompliance/src/main/AndroidManifest.xml b/play-services-gmscompliance/src/main/AndroidManifest.xml index 3c194a6514..78cfd9aa01 100644 --- a/play-services-gmscompliance/src/main/AndroidManifest.xml +++ b/play-services-gmscompliance/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-iid/build.gradle b/play-services-iid/build.gradle index 899b9dd339..d9d6508154 100644 --- a/play-services-iid/build.gradle +++ b/play-services-iid/build.gradle @@ -6,9 +6,15 @@ apply plugin: 'com.android.library' android { + namespace "com.google.android.gms.iid" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-iid/src/main/AndroidManifest.xml b/play-services-iid/src/main/AndroidManifest.xml index a3b0ea2aaa..5a3b72361e 100644 --- a/play-services-iid/src/main/AndroidManifest.xml +++ b/play-services-iid/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle index 9647c82e3c..e05b44a95a 100644 --- a/play-services-location/build.gradle +++ b/play-services-location/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.location" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-location/core/base/build.gradle b/play-services-location/core/base/build.gradle index 8f6663fe62..7a76fa5ffc 100644 --- a/play-services-location/core/base/build.gradle +++ b/play-services-location/core/base/build.gradle @@ -12,6 +12,8 @@ dependencies { } android { + namespace "org.microg.gms.location.base" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -29,4 +31,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/play-services-location/core/base/src/main/AndroidManifest.xml b/play-services-location/core/base/src/main/AndroidManifest.xml index 671251d213..115884d0b0 100644 --- a/play-services-location/core/base/src/main/AndroidManifest.xml +++ b/play-services-location/core/base/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2023 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-location/core/build.gradle b/play-services-location/core/build.gradle index d048274a0e..2ee2a66e5e 100644 --- a/play-services-location/core/build.gradle +++ b/play-services-location/core/build.gradle @@ -27,9 +27,15 @@ dependencies { } android { + namespace "org.microg.gms.location.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + buildConfig = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk @@ -45,4 +51,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/play-services-location/core/provider/build.gradle b/play-services-location/core/provider/build.gradle index 1aa2e2948d..3f8087be64 100644 --- a/play-services-location/core/provider/build.gradle +++ b/play-services-location/core/provider/build.gradle @@ -25,9 +25,15 @@ dependencies { } android { + namespace "org.microg.gms.location.provider" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + buildConfig = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk @@ -43,4 +49,8 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } diff --git a/play-services-location/core/provider/src/main/AndroidManifest.xml b/play-services-location/core/provider/src/main/AndroidManifest.xml index e75eb59df5..7437dcb865 100644 --- a/play-services-location/core/provider/src/main/AndroidManifest.xml +++ b/play-services-location/core/provider/src/main/AndroidManifest.xml @@ -3,7 +3,6 @@ ~ SPDX-License-Identifier: Apache-2.0 --> diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/LocationCacheDatabase.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/LocationCacheDatabase.kt index 33403f2f33..6bccbeb374 100644 --- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/LocationCacheDatabase.kt +++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/LocationCacheDatabase.kt @@ -25,7 +25,7 @@ import kotlin.math.max internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(context, "geocache.db", null, 3) { fun getCellLocation(cell: CellDetails, allowLearned: Boolean = true): Location? { - val cellLocation = readableDatabase.query( + var cursor = readableDatabase.query( TABLE_CELLS, arrayOf(FIELD_LATITUDE, FIELD_LONGITUDE, FIELD_ACCURACY, FIELD_TIME, FIELD_PRECISION), CELLS_SELECTION, @@ -33,16 +33,19 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte null, null, null - ).use { cursor -> + ) + val cellLocation = try { if (cursor.moveToNext()) { cursor.getLocation(MAX_CACHE_AGE) } else { null } + } finally { + cursor.close() } if (cellLocation?.precision?.let { it >= 1f } == true) return cellLocation if (allowLearned) { - readableDatabase.query( + cursor = readableDatabase.query( TABLE_CELLS_LEARN, arrayOf(FIELD_LATITUDE_HIGH, FIELD_LATITUDE_LOW, FIELD_LONGITUDE_HIGH, FIELD_LONGITUDE_LOW, FIELD_TIME, FIELD_BAD_TIME), CELLS_SELECTION, @@ -50,28 +53,35 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte null, null, null - ).use { cursor -> + ) + try { if (cursor.moveToNext()) { val badTime = cursor.getLong(5) val time = cursor.getLong(4) - if (badTime > time - LEARN_BAD_CUTOFF) return@use - cursor.getMidLocation(MAX_CACHE_AGE, LEARN_BASE_ACCURACY_CELL)?.let { return it } + if (badTime < time - LEARN_BAD_CUTOFF) { + cursor.getMidLocation(MAX_CACHE_AGE, LEARN_BASE_ACCURACY_CELL)?.let { return it } + } } + } finally { + cursor.close() } } if (cellLocation != null) return cellLocation - readableDatabase.query(TABLE_CELLS_PRE, arrayOf(FIELD_TIME), CELLS_PRE_SELECTION, getCellPreSelectionArgs(cell), null, null, null).use { cursor -> + cursor = readableDatabase.query(TABLE_CELLS_PRE, arrayOf(FIELD_TIME), CELLS_PRE_SELECTION, getCellPreSelectionArgs(cell), null, null, null) + try { if (cursor.moveToNext()) { if (cursor.getLong(1) > System.currentTimeMillis() - MAX_CACHE_AGE) { return NEGATIVE_CACHE_ENTRY } } + } finally { + cursor.close() } return null } fun getWifiLocation(wifi: WifiDetails): Location? { - val wifiLocation = readableDatabase.query( + var cursor = readableDatabase.query( TABLE_WIFIS, arrayOf(FIELD_LATITUDE, FIELD_LONGITUDE, FIELD_ACCURACY, FIELD_TIME, FIELD_PRECISION), getWifiSelection(wifi), @@ -79,15 +89,18 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte null, null, null - ).use { cursor -> + ) + val wifiLocation = try { if (cursor.moveToNext()) { cursor.getLocation(MAX_CACHE_AGE) } else { null } + } finally { + cursor.close() } if (wifiLocation?.precision?.let { it >= 1f } == true) return wifiLocation - readableDatabase.query( + cursor = readableDatabase.query( TABLE_WIFI_LEARN, arrayOf(FIELD_LATITUDE_HIGH, FIELD_LATITUDE_LOW, FIELD_LONGITUDE_HIGH, FIELD_LONGITUDE_LOW, FIELD_TIME, FIELD_BAD_TIME), getWifiSelection(wifi), @@ -95,13 +108,17 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte null, null, null - ).use { cursor -> + ) + try { if (cursor.moveToNext()) { val badTime = cursor.getLong(5) val time = cursor.getLong(4) - if (badTime > time - LEARN_BAD_CUTOFF) return@use - cursor.getMidLocation(MAX_CACHE_AGE, LEARN_BASE_ACCURACY_WIFI, 0.5)?.let { return it } + if (badTime < time - LEARN_BAD_CUTOFF) { + cursor.getMidLocation(MAX_CACHE_AGE, LEARN_BASE_ACCURACY_WIFI, 0.5)?.let { return it } + } } + } finally { + cursor.close() } return wifiLocation } @@ -121,7 +138,7 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte fun learnCellLocation(cell: CellDetails, location: Location) { if (!cell.isValid) return - val (exists, isBad) = readableDatabase.query( + val cursor = readableDatabase.query( TABLE_CELLS_LEARN, arrayOf(FIELD_LATITUDE_HIGH, FIELD_LATITUDE_LOW, FIELD_LONGITUDE_HIGH, FIELD_LONGITUDE_LOW, FIELD_TIME), CELLS_SELECTION, @@ -129,13 +146,16 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte null, null, null - ).use { cursor -> + ) + val (exists, isBad) = try { if (cursor.moveToNext()) { val midLocation = cursor.getMidLocation(Long.MAX_VALUE, 0f) (midLocation != null) to (midLocation?.let { it.distanceTo(location) > LEARN_BAD_SIZE_CELL } == true) } else { false to false } + } finally { + cursor.close() } if (exists && isBad) { writableDatabase.update( @@ -171,7 +191,7 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte fun learnWifiLocation(wifi: WifiDetails, location: Location) { if (!wifi.isRequestable) return - val (exists, isBad) = readableDatabase.query( + val cursor = readableDatabase.query( TABLE_WIFI_LEARN, arrayOf(FIELD_LATITUDE_HIGH, FIELD_LATITUDE_LOW, FIELD_LONGITUDE_HIGH, FIELD_LONGITUDE_LOW, FIELD_TIME), getWifiSelection(wifi), @@ -179,13 +199,16 @@ internal class LocationCacheDatabase(context: Context?) : SQLiteOpenHelper(conte null, null, null - ).use { cursor -> + ) + val (exists, isBad) = try { if (cursor.moveToNext()) { val midLocation = cursor.getMidLocation(Long.MAX_VALUE, 0f) (midLocation != null) to (midLocation?.let { it.distanceTo(location) > LEARN_BAD_SIZE_WIFI } == true) } else { false to false } + } finally { + cursor.close() } if (exists && isBad) { writableDatabase.update( diff --git a/play-services-location/core/src/main/AndroidManifest.xml b/play-services-location/core/src/main/AndroidManifest.xml index 3af5571577..d9687f9692 100644 --- a/play-services-location/core/src/main/AndroidManifest.xml +++ b/play-services-location/core/src/main/AndroidManifest.xml @@ -4,7 +4,6 @@ ~ SPDX-License-Identifier: Apache-2.0 --> diff --git a/play-services-location/core/system-api/build.gradle b/play-services-location/core/system-api/build.gradle index 1e7305574e..7166424644 100644 --- a/play-services-location/core/system-api/build.gradle +++ b/play-services-location/core/system-api/build.gradle @@ -10,6 +10,8 @@ dependencies { } android { + namespace "org.microg.gms.location.sysapi" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-location/core/system-api/src/main/AndroidManifest.xml b/play-services-location/core/system-api/src/main/AndroidManifest.xml index 670be7c934..fe3a9e6548 100644 --- a/play-services-location/core/system-api/src/main/AndroidManifest.xml +++ b/play-services-location/core/system-api/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2023 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-location/src/main/AndroidManifest.xml b/play-services-location/src/main/AndroidManifest.xml index 2bb2cda6f9..359a9b7122 100644 --- a/play-services-location/src/main/AndroidManifest.xml +++ b/play-services-location/src/main/AndroidManifest.xml @@ -15,4 +15,4 @@ ~ limitations under the License. --> - + diff --git a/play-services-maps-core-mapbox/build.gradle b/play-services-maps-core-mapbox/build.gradle index a0e48a4a0e..74bde1ce45 100644 --- a/play-services-maps-core-mapbox/build.gradle +++ b/play-services-maps-core-mapbox/build.gradle @@ -40,9 +40,15 @@ def execResult(...args) { } android { + namespace "org.microg.gms.maps.mapbox" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + buildConfig = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk @@ -62,17 +68,14 @@ android { disable 'GradleCompatible' } - buildTypes { - release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + kotlinOptions { + jvmTarget = 1.8 + } } if (file('user.gradle').exists()) { diff --git a/play-services-maps-core-mapbox/src/main/AndroidManifest.xml b/play-services-maps-core-mapbox/src/main/AndroidManifest.xml index 0dfbdfe99c..2585387100 100644 --- a/play-services-maps-core-mapbox/src/main/AndroidManifest.xml +++ b/play-services-maps-core-mapbox/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - diff --git a/play-services-maps-core-vtm/build.gradle b/play-services-maps-core-vtm/build.gradle index 193fb3db84..f3683da0f7 100644 --- a/play-services-maps-core-vtm/build.gradle +++ b/play-services-maps-core-vtm/build.gradle @@ -42,6 +42,8 @@ def execResult(...args) { } android { + namespace "org.microg.gms.maps.vtm" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-maps-core-vtm/src/main/AndroidManifest.xml b/play-services-maps-core-vtm/src/main/AndroidManifest.xml index 31b554e484..8b1ff634fe 100644 --- a/play-services-maps-core-vtm/src/main/AndroidManifest.xml +++ b/play-services-maps-core-vtm/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - diff --git a/play-services-maps/build.gradle b/play-services-maps/build.gradle index 68b60de42c..ce2d18508c 100644 --- a/play-services-maps/build.gradle +++ b/play-services-maps/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.maps" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-maps/src/main/AndroidManifest.xml b/play-services-maps/src/main/AndroidManifest.xml index dce4c65002..783551945c 100644 --- a/play-services-maps/src/main/AndroidManifest.xml +++ b/play-services-maps/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-measurement-base/build.gradle b/play-services-measurement-base/build.gradle index 1834ed8a5e..29e2c6939d 100644 --- a/play-services-measurement-base/build.gradle +++ b/play-services-measurement-base/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.measurement_base" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-measurement-base/src/main/AndroidManifest.xml b/play-services-measurement-base/src/main/AndroidManifest.xml index 2b5232831a..271ae97e2b 100644 --- a/play-services-measurement-base/src/main/AndroidManifest.xml +++ b/play-services-measurement-base/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - \ No newline at end of file + \ No newline at end of file diff --git a/play-services-nearby/build.gradle b/play-services-nearby/build.gradle index dac7eed1b0..dfd0bf02ce 100644 --- a/play-services-nearby/build.gradle +++ b/play-services-nearby/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.nearby" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-nearby/core/build.gradle b/play-services-nearby/core/build.gradle index 52d11a3793..82be204fc3 100644 --- a/play-services-nearby/core/build.gradle +++ b/play-services-nearby/core/build.gradle @@ -6,7 +6,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.squareup.wire' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -32,6 +31,8 @@ dependencies { } android { + namespace "org.microg.gms.nearby.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -59,6 +60,10 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } wire { diff --git a/play-services-nearby/core/src/main/AndroidManifest.xml b/play-services-nearby/core/src/main/AndroidManifest.xml index c7f8856fa5..d1cbd73896 100644 --- a/play-services-nearby/core/src/main/AndroidManifest.xml +++ b/play-services-nearby/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2020, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureNotificationServiceImpl.kt b/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureNotificationServiceImpl.kt index d81f4946e5..60a5ce1c8a 100644 --- a/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureNotificationServiceImpl.kt +++ b/play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureNotificationServiceImpl.kt @@ -5,6 +5,7 @@ package org.microg.gms.nearby.exposurenotification +import android.annotation.TargetApi import android.app.Activity import android.app.PendingIntent import android.bluetooth.BluetoothAdapter @@ -50,6 +51,7 @@ import kotlin.math.max import kotlin.math.roundToInt import kotlin.random.Random +@TargetApi(21) class ExposureNotificationServiceImpl(private val context: Context, private val lifecycle: Lifecycle, private val packageName: String) : INearbyExposureNotificationService.Stub(), LifecycleOwner { // Table of back-end public keys, used to verify the signature of the diagnosed TEKs. diff --git a/play-services-nearby/src/main/AndroidManifest.xml b/play-services-nearby/src/main/AndroidManifest.xml index d2588ca0d0..61148a1ad9 100644 --- a/play-services-nearby/src/main/AndroidManifest.xml +++ b/play-services-nearby/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2020 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + - + - + - + - + diff --git a/play-services-places-placereport/build.gradle b/play-services-places-placereport/build.gradle index db6d24aa54..d97149dfa7 100644 --- a/play-services-places-placereport/build.gradle +++ b/play-services-places-placereport/build.gradle @@ -8,6 +8,8 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.places_placereport" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-places-placereport/src/main/AndroidManifest.xml b/play-services-places-placereport/src/main/AndroidManifest.xml index 017778ac82..ca41ba7c7f 100644 --- a/play-services-places-placereport/src/main/AndroidManifest.xml +++ b/play-services-places-placereport/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022 microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-places/build.gradle b/play-services-places/build.gradle index 7104814665..c9de55263e 100644 --- a/play-services-places/build.gradle +++ b/play-services-places/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.location.places" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-places/src/main/AndroidManifest.xml b/play-services-places/src/main/AndroidManifest.xml index 5365508a41..f80cdde52a 100644 --- a/play-services-places/src/main/AndroidManifest.xml +++ b/play-services-places/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-recaptcha/build.gradle b/play-services-recaptcha/build.gradle index f605bffa40..188966d227 100644 --- a/play-services-recaptcha/build.gradle +++ b/play-services-recaptcha/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.recaptcha" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-recaptcha/core/build.gradle b/play-services-recaptcha/core/build.gradle index f1529a3103..68ddc13a73 100644 --- a/play-services-recaptcha/core/build.gradle +++ b/play-services-recaptcha/core/build.gradle @@ -33,6 +33,8 @@ wire { } android { + namespace "org.microg.gms.recaptcha.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-recaptcha/core/src/main/AndroidManifest.xml b/play-services-recaptcha/core/src/main/AndroidManifest.xml index d3330f629e..d4b5be9305 100644 --- a/play-services-recaptcha/core/src/main/AndroidManifest.xml +++ b/play-services-recaptcha/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-recaptcha/src/main/AndroidManifest.xml b/play-services-recaptcha/src/main/AndroidManifest.xml index 7dbf92a595..78331646ca 100644 --- a/play-services-recaptcha/src/main/AndroidManifest.xml +++ b/play-services-recaptcha/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-recaptcha/src/main/java/com/google/android/gms/recaptcha/VerificationHandle.java b/play-services-recaptcha/src/main/java/com/google/android/gms/recaptcha/VerificationHandle.java index 3b3dc03008..fe3f402ec5 100644 --- a/play-services-recaptcha/src/main/java/com/google/android/gms/recaptcha/VerificationHandle.java +++ b/play-services-recaptcha/src/main/java/com/google/android/gms/recaptcha/VerificationHandle.java @@ -8,7 +8,7 @@ package com.google.android.gms.recaptcha; -import org.microg.safeparcel.SafeParcelable; +import com.google.android.gms.common.internal.safeparcel.SafeParcelable; /** * Stores the information required to verify an account. diff --git a/play-services-safetynet/build.gradle b/play-services-safetynet/build.gradle index 37838ffa37..940ebc73c7 100644 --- a/play-services-safetynet/build.gradle +++ b/play-services-safetynet/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.safetynet" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-safetynet/core/build.gradle b/play-services-safetynet/core/build.gradle index f960a07d69..8ffb3ee0f7 100644 --- a/play-services-safetynet/core/build.gradle +++ b/play-services-safetynet/core/build.gradle @@ -37,6 +37,8 @@ wire { } android { + namespace "org.microg.gms.safetynet.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-safetynet/core/src/main/AndroidManifest.xml b/play-services-safetynet/core/src/main/AndroidManifest.xml index 05c6d34fdf..367177d3c8 100644 --- a/play-services-safetynet/core/src/main/AndroidManifest.xml +++ b/play-services-safetynet/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-safetynet/src/main/AndroidManifest.xml b/play-services-safetynet/src/main/AndroidManifest.xml index 710e0ee7bf..f80cdde52a 100644 --- a/play-services-safetynet/src/main/AndroidManifest.xml +++ b/play-services-safetynet/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2022, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-tapandpay/build.gradle b/play-services-tapandpay/build.gradle index 283be6836a..5cc5ba3b36 100644 --- a/play-services-tapandpay/build.gradle +++ b/play-services-tapandpay/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.tapandpay" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-tapandpay/core/build.gradle b/play-services-tapandpay/core/build.gradle index 9b00ba7758..3018e921d8 100644 --- a/play-services-tapandpay/core/build.gradle +++ b/play-services-tapandpay/core/build.gradle @@ -19,6 +19,8 @@ dependencies { } android { + namespace "org.microg.gms.tapandpay.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -42,6 +44,10 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } // Nothing to publish yet diff --git a/play-services-tapandpay/core/src/main/AndroidManifest.xml b/play-services-tapandpay/core/src/main/AndroidManifest.xml index 7edb46201e..5057512dd8 100644 --- a/play-services-tapandpay/core/src/main/AndroidManifest.xml +++ b/play-services-tapandpay/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2021, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + - + diff --git a/play-services-tasks/build.gradle b/play-services-tasks/build.gradle index b2c38fd9fb..c3cba0df9d 100644 --- a/play-services-tasks/build.gradle +++ b/play-services-tasks/build.gradle @@ -8,6 +8,8 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.tasks" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-tasks/ktx/build.gradle b/play-services-tasks/ktx/build.gradle index 71d5a6baf2..74e91186f5 100644 --- a/play-services-tasks/ktx/build.gradle +++ b/play-services-tasks/ktx/build.gradle @@ -16,6 +16,8 @@ dependencies { } android { + namespace "org.microg.gms.tasks.ktx" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-tasks/ktx/src/main/AndroidManifest.xml b/play-services-tasks/ktx/src/main/AndroidManifest.xml index 6a32b5112c..870618f4ae 100644 --- a/play-services-tasks/ktx/src/main/AndroidManifest.xml +++ b/play-services-tasks/ktx/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-tasks/src/main/AndroidManifest.xml b/play-services-tasks/src/main/AndroidManifest.xml index 6741aa2c12..c256eb4492 100644 --- a/play-services-tasks/src/main/AndroidManifest.xml +++ b/play-services-tasks/src/main/AndroidManifest.xml @@ -4,4 +4,4 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-vision-common/build.gradle b/play-services-vision-common/build.gradle index 68a060667b..d9b3ffe725 100644 --- a/play-services-vision-common/build.gradle +++ b/play-services-vision-common/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.vision_common" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-vision-common/src/main/AndroidManifest.xml b/play-services-vision-common/src/main/AndroidManifest.xml index 00580edfff..055d07d555 100644 --- a/play-services-vision-common/src/main/AndroidManifest.xml +++ b/play-services-vision-common/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2020, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-vision/build.gradle b/play-services-vision/build.gradle index f9f0ba1f70..8fea34919f 100644 --- a/play-services-vision/build.gradle +++ b/play-services-vision/build.gradle @@ -8,9 +8,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.vision" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-vision/core/build.gradle b/play-services-vision/core/build.gradle index db98898c4f..03f39c7f55 100644 --- a/play-services-vision/core/build.gradle +++ b/play-services-vision/core/build.gradle @@ -17,6 +17,8 @@ dependencies { } android { + namespace "org.microg.gms.vision.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -36,6 +38,10 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + + kotlinOptions { + jvmTarget = 1.8 + } } apply from: '../../gradle/publish-android.gradle' diff --git a/play-services-vision/core/src/main/AndroidManifest.xml b/play-services-vision/core/src/main/AndroidManifest.xml index a695ed90ab..f56b246111 100644 --- a/play-services-vision/core/src/main/AndroidManifest.xml +++ b/play-services-vision/core/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ ~ SPDX-FileCopyrightText: 2020, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-vision/src/main/AndroidManifest.xml b/play-services-vision/src/main/AndroidManifest.xml index 6cd5344815..055d07d555 100644 --- a/play-services-vision/src/main/AndroidManifest.xml +++ b/play-services-vision/src/main/AndroidManifest.xml @@ -3,4 +3,4 @@ ~ SPDX-FileCopyrightText: 2020, microG Project Team ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-wearable/build.gradle b/play-services-wearable/build.gradle index 06da9176fb..46d8ed2f73 100644 --- a/play-services-wearable/build.gradle +++ b/play-services-wearable/build.gradle @@ -9,9 +9,15 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { + namespace "com.google.android.gms.wearable" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" + buildFeatures { + aidl = true + } + defaultConfig { versionName version minSdkVersion androidMinSdk diff --git a/play-services-wearable/core/build.gradle b/play-services-wearable/core/build.gradle index 55aaf41304..5675f7e736 100644 --- a/play-services-wearable/core/build.gradle +++ b/play-services-wearable/core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -19,6 +18,8 @@ dependencies { } android { + namespace "org.microg.gms.wearable.core" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services-wearable/core/src/main/AndroidManifest.xml b/play-services-wearable/core/src/main/AndroidManifest.xml index ca285f8d3a..9df69b73bd 100644 --- a/play-services-wearable/core/src/main/AndroidManifest.xml +++ b/play-services-wearable/core/src/main/AndroidManifest.xml @@ -4,8 +4,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> - + diff --git a/play-services-wearable/src/main/AndroidManifest.xml b/play-services-wearable/src/main/AndroidManifest.xml index c5f892ffb8..359a9b7122 100644 --- a/play-services-wearable/src/main/AndroidManifest.xml +++ b/play-services-wearable/src/main/AndroidManifest.xml @@ -15,4 +15,4 @@ ~ limitations under the License. --> - + diff --git a/play-services/build.gradle b/play-services/build.gradle index 5d7886ad76..041dd5cdf0 100644 --- a/play-services/build.gradle +++ b/play-services/build.gradle @@ -17,6 +17,8 @@ apply plugin: 'com.android.library' android { + namespace "org.microg.gms" + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" diff --git a/play-services/src/main/AndroidManifest.xml b/play-services/src/main/AndroidManifest.xml index a18fdb94a0..2c64600411 100644 --- a/play-services/src/main/AndroidManifest.xml +++ b/play-services/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ ~ limitations under the License. --> - + diff --git a/settings.gradle b/settings.gradle index 0b46280437..c62e9051d4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -45,7 +45,7 @@ include ':play-services-api' include ':play-services' include ':firebase-auth' -include ':firebase-dynamic-links-api' +include ':firebase-dynamic-links' // core only