From e773a870aaaad0c14c51a35f6ad6cd56edff5099 Mon Sep 17 00:00:00 2001 From: Fynn Godau Date: Tue, 24 Oct 2023 07:51:15 +0200 Subject: [PATCH] Move profile provider to `play-services-base-core-package` --- .../core}/package/build.gradle | 0 .../core}/package/src/main/AndroidManifest.xml | 0 .../src/main/kotlin/org/microg/gms/profile/ProfileProvider.kt | 0 play-services-core/build.gradle | 2 +- settings.gradle | 4 +++- 5 files changed, 4 insertions(+), 2 deletions(-) rename {play-services-core => play-services-base/core}/package/build.gradle (100%) rename {play-services-core => play-services-base/core}/package/src/main/AndroidManifest.xml (100%) rename {play-services-core => play-services-base/core}/package/src/main/kotlin/org/microg/gms/profile/ProfileProvider.kt (100%) diff --git a/play-services-core/package/build.gradle b/play-services-base/core/package/build.gradle similarity index 100% rename from play-services-core/package/build.gradle rename to play-services-base/core/package/build.gradle diff --git a/play-services-core/package/src/main/AndroidManifest.xml b/play-services-base/core/package/src/main/AndroidManifest.xml similarity index 100% rename from play-services-core/package/src/main/AndroidManifest.xml rename to play-services-base/core/package/src/main/AndroidManifest.xml diff --git a/play-services-core/package/src/main/kotlin/org/microg/gms/profile/ProfileProvider.kt b/play-services-base/core/package/src/main/kotlin/org/microg/gms/profile/ProfileProvider.kt similarity index 100% rename from play-services-core/package/src/main/kotlin/org/microg/gms/profile/ProfileProvider.kt rename to play-services-base/core/package/src/main/kotlin/org/microg/gms/profile/ProfileProvider.kt diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 2235d26799..9dd45b4dd3 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -46,7 +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-base-core-package') implementation project(':play-services-api') implementation project(':play-services-appinvite') diff --git a/settings.gradle b/settings.gradle index 4b5d16486e..63a1e400b4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -106,4 +106,6 @@ sublude ':firebase-auth:core' include ':play-services-core:microg-ui-tools' // Legacy include ':play-services-core' -sublude ':play-services-core:package' + +include ':play-services-base-core-package' +project(':play-services-base-core-package').projectDir = file('play-services-base/core/package')