Remove unused code + Fix build error

README.md

@@ -1,24 +1,28 @@
-microG Services
+<img src="http://i.imgur.com/hXY4lcC.png" height="42px" alt="microG" /> Services Core (GmsCore)
 =======
-[![Build status](https://github.com/microg/GmsCore/actions/workflows/build.yml/badge.svg)](https://github.com/microg/GmsCore/actions/workflows/build.yml)
 
-microG Services is a FLOSS (Free/Libre Open Source Software) framework to allow applications designed for Google Play Services to run on systems, where Play Services is not available.
+A 1:1 version of [microG](https://github.com/microg/GmsCore) designed for ReVanced apps.
 
-### Please refer to the [wiki](https://github.com/microg/GmsCore/wiki) for downloads and instructions
+A big thanks to [Shadow578](https://github.com/shadow578) for its first implementation.
 
+## Notable changes
 
-License
--------
-    Copyright 2013-2023 microG Project Team
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+- No longer a system app
+- Package name changed from `com.google.android.gms` to `com.mgoogle.android.gms` to support installation alongside the official MicroG
+- Removed unnecessary features:
+  - Ads
+  - Analytics
+  - Car
+  - Droidguard
+  - Exposure-Notifications
+  - Feedback
+  - Firebase
+  - Games
+  - Maps
+  - Recovery
+  - SafetyNet
+  - Search
+  - TapAndPay
+  - Wallet
+  - Wear-Api
+- Removed all permissions, as none are required for Google authentication

build.gradle

@@ -13,33 +13,46 @@ buildscript {
     ext.kotlinVersion = '1.7.22'
     ext.coroutineVersion = '1.6.4'
 
-    ext.annotationVersion = '1.5.0'
+    ext.annotationVersion = '1.6.0'
     ext.appcompatVersion = '1.6.1'
     ext.biometricVersion = '1.1.0'
     ext.coreVersion = '1.9.0'
     ext.fragmentVersion = '1.5.5'
-    ext.lifecycleVersion = '2.5.1'
+    ext.lifecycleVersion = '2.6.1'
+    ext.materialVersion = '1.9.0'
     ext.loaderVersion = '1.1.0'
-    ext.mediarouterVersion = '1.3.1'
+    ext.mediarouterVersion = '1.4.0'
     ext.multidexVersion = '2.0.1'
-    ext.navigationVersion = '2.5.3'
+    ext.navigationVersion = '2.6.0'
     ext.preferenceVersion = '1.2.0'
     ext.recyclerviewVersion = '1.2.0'
-    ext.webkitVersion = '1.4.0'
+    ext.webkitVersion = '1.7.0'
 
     ext.slf4jVersion = '1.7.36'
     ext.volleyVersion = '1.2.1'
     ext.wireVersion = '4.8.0'
 
     ext.androidBuildGradleVersion = '8.0.2'
 
-    ext.androidBuildVersionTools = '33.0.1'
+    ext.androidBuildVersionTools = '33.0.2'
 
     ext.androidMinSdk = 14
     ext.androidTargetSdk = 29
     ext.androidCompileSdk = 33
 
     ext.localProperties = new Properties()
+
+    ext.includeProjects = [
+            ':play-services-base-core',
+            ':play-services-cast-core',
+            ':play-services-cast-framework-core',
+            ':play-services-conscrypt-provider-core',
+            ':play-services-core-proto', // deprecated
+            ':play-services-core:microg-ui-tools',
+            ':play-services-api',
+            ':play-services-tasks-ktx',
+            ':play-services-auth'
+    ]
 
     try {
         var stream = rootProject.file('local.properties').newDataInputStream()
@@ -65,54 +78,13 @@ buildscript {
     }
 }
 
-def execResult(...args) {
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine args
-        standardOutput = stdout
-    }
-    return stdout.toString()
-}
-
-def gmsVersion = "23.35.15"
-def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
-def vendingVersion = "37.5.24"
-def vendingVersionCode = Integer.parseInt(vendingVersion.replaceAll('\\.', ''))
-def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').trim().substring(1)
-def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD").trim())
-def gitCommitId = execResult('git', 'show-ref', '--abbrev=7', '--head', 'HEAD').trim().split(' ')[0]
-def gitDirty = false
-execResult('git', 'status', '--porcelain').lines().each { stat ->
-  def status = stat.substring(0,2)
-  def file = stat.substring(3)
-  if (status == '??') {
-    if (subprojects.any { p -> file.startsWith(p.name + '/') }) {
-      logger.lifecycle('Dirty file: {} (untracked)', file)
-      gitDirty = true
-    } else {
-      logger.info('New file outside module: {} (ignored for dirty check)', file)
-    }
-  } else {
-    logger.lifecycle('Dirty file: {} (changed)', file)
-    gitDirty = true
-  }
-}
-def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.'))
-def ourVersionMinor = Integer.parseInt(ourVersionBase.substring(ourVersionBase.lastIndexOf('.') + 1))
-def ourGmsVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2  + (gitCommitCount > 0 || gitDirty ? 1 : 0)
-def ourGmsVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
-def ourVendingVersionCode = 80000000 + vendingVersionCode * 100 + ourVersionMinor * 2  + (gitCommitCount > 0 || gitDirty ? 1 : 0)
-def ourVendingVersionName = "$ourVersionBase.$vendingVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
-logger.lifecycle('Starting build for GMS version {} ({})...', ourGmsVersionName, ourGmsVersionCode)
-
 allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    version = ourGmsVersionName
-    ext.vendingAppVersionName = ourVendingVersionName
-    ext.vendingAppVersionCode = ourVendingVersionCode
-    ext.appVersionCode = ourGmsVersionCode
+    ext.appVersionCode = 234313000
+    ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
+    version = "0.3.0."+ext.baseVersion.replaceAll("\\.", "")
     ext.isReleaseVersion = false
 }
 
@@ -122,4 +94,4 @@ subprojects {
         google()
         if (hasModule("hms", false)) maven {url 'https://developer.huawei.com/repo/'}
     }
-}
+}

gradle.properties

@@ -1,2 +1,7 @@
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+android.defaults.buildfeatures.buildconfig=true
+android.enableJetifier=true
+android.experimental.legacyTransform.forceNonIncremental=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false

play-services-api/build.gradle

@@ -40,5 +40,4 @@ android {
 
 dependencies {
     api project(':play-services-base')
-    api project(':play-services-phenotype')
 }