README.md

@@ -1,9 +1,9 @@
 # Vanced+ MicroG
 
-This fork tweaks MicroG to be usable by applications that require Google authentication such as [YouTube Vanced+](https://gitlab.com/cuynu/vancedx).
+This fork tweaks MicroG to be usable by applications that require Google authentication such as [YouTube Vanced+](https://gitlab.com/cuynu/ytvancedx).
 
 ## Warning!
-Vanced+ microG are currently **DOES NOT WORK** with ReVanced/RVX as they now uses their own ReVanced microG with specific package name! However, there are workaround : [Issues #15](https://gitlab.com/cuynu/VancedxMicroG/-/issues/15#note_1837372638)
+Vanced+ microG probably does not works in ReVanced/RVX in future as recent changes from ReVanced/RVX to use with they specific MicroG called ReVanced MicroG with different package name !
 
 ## Notable changes
 

build.gradle

@@ -4,31 +4,26 @@
  */
 
 buildscript {
-    ext.applicationNamespace = "com.google.android.gms"
-    ext.basePackageName = "com.mgoogle"
-
-    ext.safeParcelVersion = '1.7.1'
-
-    ext.kotlinVersion = '1.7.21'
+    ext.kotlinVersion = '1.8.20'
     ext.coroutineVersion = '1.6.4'
 
-    ext.annotationVersion = '1.5.0'
+    ext.annotationVersion = '1.6.0'
     ext.appcompatVersion = '1.6.1'
     ext.coreVersion = '1.9.0'
     ext.collectionVersion = '1.3.0-dev01'
     ext.fragmentVersion = '1.5.5'
     ext.lifecycleVersion = '2.5.1'
-    ext.materialVersion = '1.7.0'
+    ext.materialVersion = '1.8.0'
     ext.navigationVersion = '2.5.3'
     ext.preferenceVersion = '1.2.0'
-    ext.webkitVersion = '1.5.0'
+    ext.webkitVersion = '1.6.0'
 
     ext.circleimageviewVersion = '3.1.0'
     ext.volleyVersion = '1.2.1'
-    ext.wireVersion = '4.8.0'
+    ext.wireVersion = '4.5.5'
 
 
-    ext.androidBuildGradleVersion = '8.0.2'
+    ext.androidBuildGradleVersion = '8.0.0'
     ext.androidBuildVersionTools = '33.0.2'
 
     ext.androidMinSdk = 23
@@ -41,14 +36,14 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:$androidBuildGradleVersion"
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
     }
 }
 
 
-def gmsVersion = "25.09.34"
+def gmsVersion = "24.09.13"
 def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
 
 def ourVersionBase = "0.3.0"
@@ -70,13 +65,4 @@ subprojects {
         mavenCentral()
         google()
     }
-    afterEvaluate {
-        // Temporary hack for Android Studio
-        if (project.plugins.hasPlugin('com.android.base')) {
-            dependencies {
-                compileOnly "org.microg:safe-parcel:$safeParcelVersion"
-                testCompileOnly "org.microg:safe-parcel:$safeParcelVersion"
-            }
-        }
-    }
-}
+}

fake-signature/build.gradle

@@ -1,26 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 microG Project Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-apply plugin: 'com.android.library'
-
-android {
-    namespace "org.microg.signature.fake"
-
-    compileSdkVersion androidCompileSdk
-    buildToolsVersion androidBuildVersionTools
-
-    defaultConfig {
-        minSdkVersion androidMinSdk
-        targetSdkVersion androidTargetSdk
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-}
-
-dependencies {
-}

fake-signature/src/main/res/values/arrays.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ SPDX-FileCopyrightText: 2023 microG Project Team
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-
-<resources>
-    <string-array name="signature_want_fake">
-        <item>com.google.android.gms</item>
-        <item>com.android.vending</item>
-        <item>com.spotify.music</item>
-    </string-array>
-    <string-array name="signature_never_fake">
-        <item>com.truecaller</item>
-    </string-array>
-</resources>

gradle.properties

@@ -1,5 +1,5 @@
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
+#Thu Jun 29 16:45:22 ICT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# SPDX-License-Identifier: Apache-2.0
 #
 # Copyright © 2015-2021 the original authors.
 #
@@ -55,7 +56,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +81,13 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -125,35 +128,26 @@ if [ -n "$JAVA_HOME" ] ; then
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,15 +192,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -214,12 +204,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
@@ -246,4 +230,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -55,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -65,6 +64,21 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
@@ -72,19 +86,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

play-services-api/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion androidCompileSdk
-    buildToolsVersion androidBuildVersionTools
+    compileSdk androidCompileSdk
+    buildToolsVersion '33.0.2'
 
     defaultConfig {
         minSdkVersion androidMinSdk
@@ -26,13 +26,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 17
-        targetCompatibility = 17
+        sourceCompatibility = 1.8
+        targetCompatibility = "1.8"
     }
+    namespace 'org.microg.gms.api'
     buildFeatures {
         aidl true
     }
-    namespace 'org.microg.gms.api'
 }
 
 dependencies {

play-services-api/src/main/AndroidManifest.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013-2017 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.
-  -->
-
-<manifest />

play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl

@@ -7,7 +7,7 @@ import com.google.android.gms.auth.AccountChangeEventsResponse;
 import com.google.android.gms.auth.AccountChangeEventsRequest;
 import com.google.android.gms.auth.GetHubTokenRequest;
 import com.google.android.gms.auth.GetHubTokenInternalResponse;
-import com.google.android.gms.auth.HasCapabilitiesRequest;
+import com.google.android.gms.auth.HasCababilitiesRequest;
 
 interface IAuthManagerService {
     Bundle getToken(String accountName, String scope, in Bundle extras) = 0;
@@ -18,6 +18,6 @@ interface IAuthManagerService {
     Bundle getAccounts(in Bundle extras) = 5;
     Bundle removeAccount(in Account account) = 6;
     Bundle requestGoogleAccountsAccess(String packageName) = 7;
-    int hasCapabilities(in HasCapabilitiesRequest request) = 8;
+    int hasCapabilities(in HasCababilitiesRequest request) = 8;
     GetHubTokenInternalResponse getHubToken(in GetHubTokenRequest request, in Bundle extras) = 9;
 }

play-services-api/src/main/aidl/com/google/android/gms/auth/HasCababilitiesRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth;
+
+parcelable HasCababilitiesRequest;

play-services-api/src/main/aidl/com/google/android/gms/common/internal/GoogleCertificatesQuery.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.internal;
+
+parcelable GoogleCertificatesQuery;

play-services-api/src/main/aidl/com/google/android/gms/common/internal/ICertData.aidl

@@ -0,0 +1,8 @@
+package com.google.android.gms.common.internal;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface ICertData {
+    IObjectWrapper getWrappedBytes();
+    int remoteHashCode();
+}

play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGoogleCertificatesApi.aidl

@@ -0,0 +1,12 @@
+package com.google.android.gms.common.internal;
+
+import com.google.android.gms.common.internal.GoogleCertificatesQuery;
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface IGoogleCertificatesApi {
+    IObjectWrapper getGoogleCertficates();
+    IObjectWrapper getGoogleReleaseCertificates();
+    boolean isGoogleReleaseSigned(String packageName, IObjectWrapper certData);
+    boolean isGoogleSigned(String packageName, IObjectWrapper certData);
+    boolean isGoogleOrPlatformSigned(in GoogleCertificatesQuery query, IObjectWrapper packageManager);
+}

play-services-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl

@@ -0,0 +1,7 @@
+package com.google.android.gms.common.internal;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface ISignInButtonCreator {
+    IObjectWrapper createSignInButton(IObjectWrapper context, int size, int color); // returns View
+}

play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java

@@ -19,5 +19,5 @@ package com.google.android.gms.auth;
 import org.microg.safeparcel.AutoSafeParcelable;
 
 public class AccountChangeEvent extends AutoSafeParcelable {
-    public static Creator<AccountChangeEvent> CREATOR = new AutoCreator<AccountChangeEvent>(AccountChangeEvent.class);
+    public static Creator<AccountChangeEvent> CREATOR = new AutoCreator<>(AccountChangeEvent.class);
 }

play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java

@@ -21,18 +21,18 @@ import static org.microg.gms.auth.AuthConstants.DEFAULT_ACCOUNT_TYPE;
 import android.accounts.Account;
 
 import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
 
 public class AccountChangeEventsRequest extends AutoSafeParcelable {
-    @Field(1)
-    private final int versionCode = 1;
-    @Field(2)
-    private int since;
     @Field(3)
     @Deprecated
-    private String accountName;
+    private final String accountName;
     @Field(4)
-    private Account account;
+    private final Account account;
+
+    public AccountChangeEventsRequest(String accountName, Account account) {
+        this.accountName = accountName;
+        this.account = account;
+    }
 
     public Account getAccount() {
         if (account != null) return account;
@@ -40,6 +40,6 @@ public class AccountChangeEventsRequest extends AutoSafeParcelable {
         return null;
     }
 
-    public static Creator<AccountChangeEventsRequest> CREATOR = new AutoCreator<AccountChangeEventsRequest>(AccountChangeEventsRequest.class);
+    public static Creator<AccountChangeEventsRequest> CREATOR = new AutoCreator<>(AccountChangeEventsRequest.class);
 
 }