Merge branch '556os-update-gmscore-for-2fa' into 'master' (8a9f97a1) · Commits · e / os / GmsCore

README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow a

		License
		-------
		Copyright 2013-2021 microG Project Team
		Copyright 2013-2022 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.

build.gradle

+8 −36

Original line number	Diff line number	Diff line
		/*
		* SPDX-FileCopyrightText: 2013, microG Project Team
		* SPDX-FileCopyrightText: 2013 microG Project Team
		* SPDX-License-Identifier: Apache-2.0
		*/

		buildscript {
		ext.cronetVersion = '91.0.4472.120.1'
		ext.nlpVersion = '2.0-alpha8'
		ext.cronetVersion = '102.5005.125'
		ext.nlpVersion = '2.0-alpha10'
		ext.safeParcelVersion = '1.7.0'
		ext.wearableVersion = '0.1.1'

		ext.kotlinVersion = '1.6.10'
		ext.coroutineVersion = '1.5.2'

		ext.annotationVersion = '1.2.0'
		ext.annotationVersion = '1.3.0'
		ext.appcompatVersion = '1.4.1'
		ext.biometricVersion = '1.1.0'
		ext.coreVersion = '1.7.0'
		ext.fragmentVersion = '1.4.0'
		ext.lifecycleVersion = '2.4.0'
		ext.loaderVersion = '1.1.0'
		ext.mediarouterVersion = '1.2.5'
		ext.multidexVersion = '2.0.1'
		ext.navigationVersion = '2.3.5'
		@@ -37,7 +39,7 @@ buildscript {
		ext.androidCompileSdk = 31

		repositories {
		jcenter()
		mavenCentral()
		google()
		}

		@@ -69,17 +71,6 @@ def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2 + (gitCommitCo
		def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
		logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)

		@Deprecated
		String getMyVersionName() {
		return ourVersionName
		}

		@Deprecated
		int getMyVersionCode() {
		return ourVersionCode
		}


		allprojects {
		apply plugin: 'idea'

		@@ -89,28 +80,9 @@ allprojects {
		ext.isReleaseVersion = false
		}

		@Deprecated
		def androidCompileSdk() { return androidCompileSdk }

		@Deprecated
		def androidTargetSdk() { return androidTargetSdk }

		@Deprecated
		def androidMinSdk() { return androidMinSdk }

		@Deprecated
		def versionCode() {
		return ourVersionCode
		}

		@Deprecated
		def versionName() {
		return ourVersionName
		}

		subprojects {
		repositories {
		jcenter()
		mavenCentral()
		google()
		}
		}

gradle/publish-android.gradle

+0 −4

Original line number	Diff line number	Diff line
		@@ -31,10 +31,6 @@ afterEvaluate {
		id = 'microg'
		name = 'microG Team'
		}
		developer {
		id = 'mar-v-in'
		name = 'Marvin W.'
		}
		}
		scm {
		url = 'https://github.com/microg/GmsCore'

gradle/publish-java.gradle

+0 −4

Original line number	Diff line number	Diff line
		@@ -42,10 +42,6 @@ afterEvaluate {
		id = 'microg'
		name = 'microG Team'
		}
		developer {
		id = 'mar-v-in'
		name = 'Marvin W.'
		}
		}
		scm {
		url = 'https://github.com/microg/GmsCore'

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -5,13 +5,19 @@ import android.accounts.Account;

		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.HasCababilitiesRequest;

		interface IAuthManagerService {
		Bundle getToken(String accountName, String scope, in Bundle extras) = 0;
		Bundle clearToken(String token, in Bundle extras) = 1;
		AccountChangeEventsResponse getChangeEvents(in AccountChangeEventsRequest request) = 2;

		Bundle getTokenWithAccount(in Account account, String scope, in Bundle extras) = 4;
		Bundle getAccounts(in Bundle extras) = 5;
		Bundle removeAccount(in Account account) = 6;
		Bundle requestGoogleAccountsAccess(String packageName) = 7;
		int hasCapabilities(in HasCababilitiesRequest request) = 8;
		GetHubTokenInternalResponse getHubToken(in GetHubTokenRequest request, in Bundle extras) = 9;
		}