mirror of
https://github.com/TeamVanced/VancedMicroG
synced 2024-09-12 17:26:53 +02:00
Bump version
This commit is contained in:
parent
b0fae31c4b
commit
baf890cf18
@ -1,6 +1,6 @@
|
||||
<img src="http://i.imgur.com/hXY4lcC.png" height="42px" alt="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.
|
||||
|
||||
|
@ -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"))
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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.
|
||||
|
@ -40,6 +40,7 @@ android {
|
||||
versionName version
|
||||
minSdkVersion androidMinSdk
|
||||
targetSdkVersion androidTargetSdk
|
||||
buildConfigField "int", "VERSION_CODE", "$appVersionCode"
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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")
|
||||
|
@ -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
|
||||
|
@ -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.<FileState>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());
|
||||
|
@ -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);
|
||||
|
@ -46,7 +46,7 @@ public abstract class GoogleLocationManagerClient extends GmsClient<IGoogleLocat
|
||||
throws RemoteException {
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString("client_name", "locationServices");
|
||||
broker.getGoogleLocationManagerService(callbacks, Constants.MAX_REFERENCE_VERSION,
|
||||
broker.getGoogleLocationManagerService(callbacks, Constants.GMS_VERSION_CODE,
|
||||
getContext().getPackageName(), bundle);
|
||||
}
|
||||
}
|
||||
|
@ -96,7 +96,7 @@ class ExposureNotificationServiceImpl(private val context: Context, private val
|
||||
}
|
||||
|
||||
override fun getVersion(params: GetVersionParams) {
|
||||
params.callback.onResult(Status.SUCCESS, Constants.MAX_REFERENCE_VERSION.toLong())
|
||||
params.callback.onResult(Status.SUCCESS, Constants.GMS_VERSION_CODE.toLong())
|
||||
}
|
||||
|
||||
override fun getCalibrationConfidence(params: GetCalibrationConfidenceParams) {
|
||||
|
Loading…
Reference in New Issue
Block a user