From baf890cf1840aed507eeb3b0e77ec3942f32cb07 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 12 Jan 2021 14:24:51 +0100 Subject: [PATCH] Bump version --- README.md | 2 +- build.gradle | 2 +- .../google/android/gms/common/GoogleApiAvailability.java | 2 +- .../google/android/gms/common/GooglePlayServicesUtil.java | 2 +- play-services-basement/build.gradle | 1 + .../android/gms/common/internal/GetServiceRequest.java | 4 ++-- .../src/main/java/org/microg/gms/common/Constants.java | 6 +++++- .../src/main/java/org/microg/gms/auth/AuthRequest.java | 2 +- .../main/java/org/microg/gms/auth/login/LoginActivity.java | 4 ++-- .../src/main/java/org/microg/gms/snet/Attestation.java | 4 ++-- .../src/main/java/org/microg/gms/iid/InstanceIdRpc.java | 4 ++-- .../microg/gms/location/GoogleLocationManagerClient.java | 2 +- .../exposurenotification/ExposureNotificationServiceImpl.kt | 2 +- 13 files changed, 21 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 17dc20a2..48d7bca1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ microG Services Core (GmsCore) ======= -[![Build Status](https://travis-ci.com/microg/GmsCore.svg?branch=master)](https://travis-ci.com/microg/GmsCore) +[![Build Status](https://github.com/microg/GmsCore/workflows/Build/badge.svg)](https://travis-ci.com/microg/GmsCore) microG GmsCore 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. diff --git a/build.gradle b/build.gradle index 1c0e0952..c42bb3b4 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ def execResult(...args) { return stdout.toString().trim() } -def gmsVersion = "20.47.13" +def gmsVersion = "20.47.14" def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', '')) def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1) def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD")) diff --git a/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java b/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java index 0439619e..889cc7f6 100644 --- a/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java +++ b/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java @@ -55,7 +55,7 @@ public class GoogleApiAvailability { /** * Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode). */ - public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.MAX_REFERENCE_VERSION; + public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.GMS_VERSION_CODE; private static GoogleApiAvailability instance; diff --git a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java index 5fb995b5..4850b816 100644 --- a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java +++ b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java @@ -52,7 +52,7 @@ public class GooglePlayServicesUtil { * Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode). */ @Deprecated - public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.MAX_REFERENCE_VERSION; + public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.GMS_VERSION_CODE; /** * Package name for Google Play Store. diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index 9fb09e1e..8c7ec067 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -40,6 +40,7 @@ android { versionName version minSdkVersion androidMinSdk targetSdkVersion androidTargetSdk + buildConfigField "int", "VERSION_CODE", "$appVersionCode" } sourceSets { diff --git a/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java index 6abc7687..fbd84dba 100644 --- a/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java +++ b/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java @@ -60,12 +60,12 @@ public class GetServiceRequest extends AutoSafeParcelable { private GetServiceRequest() { serviceId = -1; - gmsVersion = Constants.MAX_REFERENCE_VERSION; + gmsVersion = Constants.GMS_VERSION_CODE; } public GetServiceRequest(int serviceId) { this.serviceId = serviceId; - this.gmsVersion = Constants.MAX_REFERENCE_VERSION; + this.gmsVersion = Constants.GMS_VERSION_CODE; this.field12 = true; } diff --git a/play-services-basement/src/main/java/org/microg/gms/common/Constants.java b/play-services-basement/src/main/java/org/microg/gms/common/Constants.java index 0ac6aae5..b2bc6353 100644 --- a/play-services-basement/src/main/java/org/microg/gms/common/Constants.java +++ b/play-services-basement/src/main/java/org/microg/gms/common/Constants.java @@ -16,9 +16,13 @@ package org.microg.gms.common; +import org.microg.gms.basement.BuildConfig; + public class Constants { - public static final int MAX_REFERENCE_VERSION = 204713 * 1000; + public static final int GMS_VERSION_CODE = (BuildConfig.VERSION_CODE / 1000) * 1000; public static final String GMS_PACKAGE_NAME = "com.google.android.gms"; public static final String GSF_PACKAGE_NAME = "com.google.android.gsf"; public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788"; + @Deprecated + public static final int MAX_REFERENCE_VERSION = GMS_VERSION_CODE; } diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java index 6de2e815..8365adb9 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java @@ -58,7 +58,7 @@ public class AuthRequest extends HttpFormClient.Request { @RequestContent("lang") public String locale; @RequestContent("google_play_services_version") - public int gmsVersion = Constants.MAX_REFERENCE_VERSION; + public int gmsVersion = Constants.GMS_VERSION_CODE; @RequestContent("accountType") public String accountType; @RequestContent("Email") diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java index 7a292df3..13a26b2e 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java @@ -73,7 +73,7 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; -import static org.microg.gms.common.Constants.MAX_REFERENCE_VERSION; +import static org.microg.gms.common.Constants.GMS_VERSION_CODE; public class LoginActivity extends AssistantActivity { public static final String TMPL_NEW_ACCOUNT = "new_account"; @@ -463,7 +463,7 @@ public class LoginActivity extends AssistantActivity { @JavascriptInterface public final int getPlayServicesVersionCode() { - return MAX_REFERENCE_VERSION; + return GMS_VERSION_CODE; } @JavascriptInterface diff --git a/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java b/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java index 36dc6776..f1993ca4 100644 --- a/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java +++ b/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java @@ -76,7 +76,7 @@ public class Attestation { .packageName(packageName) .fileDigest(getPackageFileDigest()) .signatureDigest(getPackageSignatures()) - .gmsVersionCode(Constants.MAX_REFERENCE_VERSION) + .gmsVersionCode(Constants.GMS_VERSION_CODE) //.googleCn(false) .seLinuxState(new SELinuxState.Builder().enabled(true).supported(true).build()) .suCandidates(Collections.emptyList()) @@ -155,7 +155,7 @@ public class Attestation { connection.setRequestProperty("content-type", "application/x-protobuf"); connection.setRequestProperty("Accept-Encoding", "gzip"); Build build = Utils.getBuild(context); - connection.setRequestProperty("User-Agent", "SafetyNet/" + Constants.MAX_REFERENCE_VERSION + " (" + build.device + " " + build.id + "); gzip"); + connection.setRequestProperty("User-Agent", "SafetyNet/" + Constants.GMS_VERSION_CODE + " (" + build.device + " " + build.id + "); gzip"); OutputStream os = connection.getOutputStream(); os.write(request.encode()); diff --git a/play-services-iid/src/main/java/org/microg/gms/iid/InstanceIdRpc.java b/play-services-iid/src/main/java/org/microg/gms/iid/InstanceIdRpc.java index 77f65f5e..cce6616f 100644 --- a/play-services-iid/src/main/java/org/microg/gms/iid/InstanceIdRpc.java +++ b/play-services-iid/src/main/java/org/microg/gms/iid/InstanceIdRpc.java @@ -57,7 +57,7 @@ import static com.google.android.gms.iid.InstanceID.ERROR_SERVICE_NOT_AVAILABLE; import static com.google.android.gms.iid.InstanceID.ERROR_TIMEOUT; import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; import static org.microg.gms.common.Constants.GSF_PACKAGE_NAME; -import static org.microg.gms.common.Constants.MAX_REFERENCE_VERSION; +import static org.microg.gms.common.Constants.GMS_VERSION_CODE; import static org.microg.gms.gcm.GcmConstants.ACTION_C2DM_REGISTER; import static org.microg.gms.gcm.GcmConstants.ACTION_C2DM_REGISTRATION; import static org.microg.gms.gcm.GcmConstants.ACTION_INSTANCE_ID; @@ -284,7 +284,7 @@ public class InstanceIdRpc { data.putString(EXTRA_OS_VERSION, Integer.toString(Build.VERSION.SDK_INT)); data.putString(EXTRA_APP_VERSION_CODE, Integer.toString(getSelfVersionCode(context))); data.putString(EXTRA_APP_VERSION_NAME, getSelfVersionName(context)); - data.putString(EXTRA_CLIENT_VERSION, "iid-" + MAX_REFERENCE_VERSION); + data.putString(EXTRA_CLIENT_VERSION, "iid-" + GMS_VERSION_CODE); data.putString(EXTRA_APP_ID, InstanceID.sha1KeyPair(keyPair)); String pub = base64encode(keyPair.getPublic().getEncoded()); data.putString(EXTRA_PUBLIC_KEY, pub); diff --git a/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java index deb26d47..3d542782 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java +++ b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java @@ -46,7 +46,7 @@ public abstract class GoogleLocationManagerClient extends GmsClient