Merge branch 'microg:master' into patch-4

microg · Aug 18, 2023 · 1cd95cd · 1cd95cd
2 parents 7626be9 + 4c32a11
commit 1cd95cd
Show file tree

Hide file tree

Showing 176 changed files with 553 additions and 184 deletions.
diff --git 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
@@ -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
@@ -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
@@ -3,8 +3,7 @@
   ~ SPDX-FileCopyrightText: 2020, microG Project Team
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.firebase.auth.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />

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
@@ -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
@@ -4,4 +4,4 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="org.microg.gms.firebase.auth.api" />
+<manifest />
diff --git a/firebase-dynamic-links-api/build.gradle → firebase-dynamic-links/build.gradle b/firebase-dynamic-links-api/build.gradle → 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/...ic-links-api/src/main/AndroidManifest.xml → ...ynamic-links/src/main/AndroidManifest.xml b/...ic-links-api/src/main/AndroidManifest.xml → ...ynamic-links/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.firebase.dynamiclinks.api"/>
+<manifest />
diff --git a/...ynamiclinks/internal/DynamicLinkData.aidl → ...ynamiclinks/internal/DynamicLinkData.aidl b/...ynamiclinks/internal/DynamicLinkData.aidl → ...ynamiclinks/internal/DynamicLinkData.aidl
diff --git a/...inks/internal/IDynamicLinksCallbacks.aidl → ...inks/internal/IDynamicLinksCallbacks.aidl b/...inks/internal/IDynamicLinksCallbacks.aidl → ...inks/internal/IDynamicLinksCallbacks.aidl
diff --git a/...clinks/internal/IDynamicLinksService.aidl → ...clinks/internal/IDynamicLinksService.aidl b/...clinks/internal/IDynamicLinksService.aidl → ...clinks/internal/IDynamicLinksService.aidl
diff --git a/...clinks/internal/ShortDynamicLinkImpl.aidl → ...clinks/internal/ShortDynamicLinkImpl.aidl b/...clinks/internal/ShortDynamicLinkImpl.aidl → ...clinks/internal/ShortDynamicLinkImpl.aidl
diff --git a/...se/dynamiclinks/internal/WarningImpl.aidl → ...se/dynamiclinks/internal/WarningImpl.aidl b/...se/dynamiclinks/internal/WarningImpl.aidl → ...se/dynamiclinks/internal/WarningImpl.aidl
diff --git a/...rebase/dynamiclinks/ShortDynamicLink.java → ...rebase/dynamiclinks/ShortDynamicLink.java b/...rebase/dynamiclinks/ShortDynamicLink.java → ...rebase/dynamiclinks/ShortDynamicLink.java
diff --git a/...ynamiclinks/internal/DynamicLinkData.java → ...ynamiclinks/internal/DynamicLinkData.java b/...ynamiclinks/internal/DynamicLinkData.java → ...ynamiclinks/internal/DynamicLinkData.java
diff --git a/...clinks/internal/ShortDynamicLinkImpl.java → ...clinks/internal/ShortDynamicLinkImpl.java b/...clinks/internal/ShortDynamicLinkImpl.java → ...clinks/internal/ShortDynamicLinkImpl.java
diff --git a/...se/dynamiclinks/internal/WarningImpl.java → ...se/dynamiclinks/internal/WarningImpl.java b/...se/dynamiclinks/internal/WarningImpl.java → ...se/dynamiclinks/internal/WarningImpl.java
diff --git 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
@@ -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
@@ -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
@@ -4,4 +4,4 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="com.google.android.gms.ads_base"/>
+<manifest />
diff --git 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
@@ -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
@@ -3,8 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="org.microg.gms.ads.identifier"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service android:name=".AdvertisingIdService">

diff --git 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
   -->
 
-<manifest package="com.google.android.gms.ads.identifier"/>
+<manifest />
diff --git 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
@@ -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
@@ -3,6 +3,5 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="org.microg.gms.ads"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git 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
   -->
 
-<manifest package="com.google.android.gms.ads"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />

diff --git 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
@@ -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
@@ -3,8 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="org.microg.gms.ads.impl"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <service android:name="org.microg.gms.ads.AdRequestService">
             <intent-filter>

diff --git 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
   -->
 
-<manifest package="com.google.android.gms.ads.impl"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:tools="http://schemas.android.com/tools">
     <uses-sdk tools:overrideLibrary="androidx.browser" />
 </manifest>
diff --git 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
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.api"/>
+<manifest />
diff --git 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
@@ -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
@@ -3,8 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest package="org.microg.gms.appinvite"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
     <application>

diff --git a/play-services-appinvite/src/main/AndroidManifest.xml b/play-services-appinvite/src/main/AndroidManifest.xml
@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="com.google.android.gms.appinvite"/>
+<manifest />
diff --git 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
@@ -3,4 +3,4 @@
   ~ SPDX-FileCopyrightText: 2023 microG Project Team
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-<manifest package="com.google.android.gms.auth.api.phone"/>
+<manifest />