Move profile provider to play-services-core-package

microg · Oct 12, 2023 · 0019cdb · 0019cdb
1 parent ae1aa56
commit 0019cdb
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 9 deletions.
diff --git a/play-services-base/core/src/main/AndroidManifest.xml b/play-services-base/core/src/main/AndroidManifest.xml
@@ -3,19 +3,12 @@
   ~ SPDX-FileCopyrightText: 2020, microG Project Team
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <provider
             android:name="org.microg.gms.settings.SettingsProvider"
             android:authorities="${applicationId}.microg.settings"
             android:exported="false" />
-
-        <provider
-            android:name="org.microg.gms.profile.ProfileProvider"
-            android:authorities="${applicationId}.microg.profile"
-            android:exported="true"
-            tools:ignore="ExportedContentProvider" />
     </application>
 </manifest>
diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt
@@ -93,7 +93,7 @@ object ProfileManager {
         }
     }.getOrDefault(false)
 
-    internal fun getActiveProfileData(context: Context): Map<String, String> =
+    fun getActiveProfileData(context: Context): Map<String, String> =
         getProfileData(context, getProfile(context), getRealData())
 
     private fun getProfileData(context: Context, profile: String, realData: Map<String, String>): Map<String, String> {

diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
@@ -46,6 +46,7 @@ dependencies {
     implementation project(':play-services-core-proto')
 
     implementation project(':play-services-core:microg-ui-tools') // deprecated
+    implementation project(':play-services-core-package')
     implementation project(':play-services-api')
 
     implementation project(':play-services-appinvite')

diff --git a/play-services-core/package/build.gradle b/play-services-core/package/build.gradle
@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+dependencies {
+    implementation project(':play-services-base-core')
+}
+
+android {
+    namespace "org.microg.gms.core.pkg"
+
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    sourceSets {
+        main {
+            java.srcDirs = ['src/main/kotlin']
+        }
+    }
+
+    lintOptions {
+        disable 'MissingTranslation'
+    }
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = 1.8
+    }
+}
diff --git a/play-services-core/package/src/main/AndroidManifest.xml b/play-services-core/package/src/main/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2023 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application>
+        <provider
+            android:name="org.microg.gms.profile.ProfileProvider"
+            android:authorities="${applicationId}.microg.profile"
+            android:exported="true"
+            tools:ignore="ExportedContentProvider" />
+    </application>
+</manifest>
diff --git a/...org/microg/gms/profile/ProfileProvider.kt → ...org/microg/gms/profile/ProfileProvider.kt b/...org/microg/gms/profile/ProfileProvider.kt → ...org/microg/gms/profile/ProfileProvider.kt
diff --git a/settings.gradle b/settings.gradle
@@ -106,3 +106,4 @@ sublude ':firebase-auth:core'
 
 include ':play-services-core:microg-ui-tools' // Legacy
 include ':play-services-core'
+sublude ':play-services-core:package'