MicroG 0.2.18.210390

- Bump version.
- Automatically fetch versioncode from buildconfig.
- Code cleanup.
This commit is contained in:
Oizaro 2021-03-13 21:58:28 +01:00
parent e89f21e9e3
commit 338a471cb2
35 changed files with 85 additions and 105 deletions

View File

@ -1,15 +0,0 @@
language: java
jdk: openjdk8
install:
- mkdir $HOME/android-cmdline-tools
- curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-cmdline-tools/cmdline-tools.zip
- unzip -qq -n $HOME/android-cmdline-tools/cmdline-tools.zip -d $HOME/android-cmdline-tools
- echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platform-tools'
- echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'build-tools;29.0.3'
- echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platforms;android-30'
env:
- ANDROID_HOME=$HOME/android-sdk TERM=dumb JAVA_OPTS="-Xmx2048m"
before_script:
- echo sdk.dir $ANDROID_HOME > local.properties
script:
- ./gradlew --no-daemon build

View File

@ -4,24 +4,24 @@
*/ */
buildscript { buildscript {
ext.safeParcelVersion = '1.6.0' ext.safeParcelVersion = '1.7.0'
ext.kotlinVersion = '1.4.31' ext.kotlinVersion = '1.4.31'
ext.coroutineVersion = '1.3.7' ext.coroutineVersion = '1.3.7'
ext.annotationVersion = '1.1.0' ext.annotationVersion = '1.1.0'
ext.appcompatVersion = '1.1.0' ext.appcompatVersion = '1.2.0'
ext.fragmentVersion = '1.3.0' ext.fragmentVersion = '1.3.0'
ext.lifecycleVersion = '2.3.0' ext.lifecycleVersion = '2.3.0'
ext.mediarouterVersion = '1.1.0' ext.mediarouterVersion = '1.2.0'
ext.navigationVersion = '2.3.0' ext.navigationVersion = '2.3.1'
ext.preferenceVersion = '1.1.1' ext.preferenceVersion = '1.1.1'
ext.recyclerviewVersion = '1.1.0' ext.recyclerviewVersion = '1.1.0'
ext.supportLibraryVersion = "28.0.0" ext.supportLibraryVersion = "28.0.0"
ext.wireVersion = '3.2.2' ext.wireVersion = '3.2.2'
ext.androidBuildGradleVersion = "4.0.1" ext.androidBuildGradleVersion = "4.1.0"
ext.androidBuildVersionTools = "29.0.3" ext.androidBuildVersionTools = "29.0.3"
@ -45,8 +45,8 @@ allprojects {
apply plugin: 'idea' apply plugin: 'idea'
group = 'org.microg.gms' group = 'org.microg.gms'
version = "0.2.16.204713" version = "0.2.18.210390"
ext.appVersionCode = 204713001 ext.appVersionCode = 210390001
ext.isReleaseVersion = false ext.isReleaseVersion = false
} }
@ -55,5 +55,4 @@ subprojects {
jcenter() jcenter()
google() google()
} }
} }

View File

@ -1,6 +1,6 @@
#Sun Dec 27 23:11:46 GMT 2020 #Sat Mar 13 21:39:25 CET 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip

View File

@ -38,4 +38,4 @@ dependencies {
api project(':play-services-cast-framework-api') api project(':play-services-cast-framework-api')
api project(':play-services-iid-api') api project(':play-services-iid-api')
api project(':play-services-location-api') api project(':play-services-location-api')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -37,4 +37,4 @@ android {
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
} }
} }

View File

@ -33,10 +33,12 @@ android {
} }
dependencies { dependencies {
implementation 'com.google.android.gms:play-services-base:17.6.0'
api project(':play-services-basement') api project(':play-services-basement')
api project(':play-services-tasks') api project(':play-services-tasks')
api project(':play-services-base-api') api project(':play-services-base-api')
implementation "androidx.fragment:fragment:${fragmentVersion}" implementation "androidx.fragment:fragment:1.3.1"
implementation 'com.google.android.gms:play-services-base:17.6.0' implementation 'com.google.android.gms:play-services-base:17.6.0'
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -55,7 +55,7 @@ public class GoogleApiAvailability {
/** /**
* Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode). * 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; private static GoogleApiAvailability instance;

View File

@ -52,7 +52,7 @@ public class GooglePlayServicesUtil {
* Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode). * Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode).
*/ */
@Deprecated @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. * Package name for Google Play Store.

View File

@ -38,6 +38,7 @@ android {
versionName version versionName version
minSdkVersion androidMinSdk minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk targetSdkVersion androidTargetSdk
buildConfigField "int", "VERSION_CODE", "$appVersionCode"
} }
sourceSets { sourceSets {
@ -48,4 +49,4 @@ android {
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
} }
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -31,6 +31,7 @@ import java.util.Arrays;
import kotlin.Suppress; import kotlin.Suppress;
@SuppressWarnings("deprecation")
public class GetServiceRequest extends AutoSafeParcelable { public class GetServiceRequest extends AutoSafeParcelable {
@SafeParceled(1) @SafeParceled(1)
private int versionCode = 3; private int versionCode = 3;
@ -61,12 +62,12 @@ public class GetServiceRequest extends AutoSafeParcelable {
private GetServiceRequest() { private GetServiceRequest() {
serviceId = -1; serviceId = -1;
gmsVersion = Constants.MAX_REFERENCE_VERSION; gmsVersion = Constants.GMS_VERSION_CODE;
} }
public GetServiceRequest(int serviceId) { public GetServiceRequest(int serviceId) {
this.serviceId = serviceId; this.serviceId = serviceId;
this.gmsVersion = Constants.MAX_REFERENCE_VERSION; this.gmsVersion = Constants.GMS_VERSION_CODE;
} }
@Override @Override

View File

@ -16,9 +16,13 @@
package org.microg.gms.common; package org.microg.gms.common;
import org.microg.gms.basement.BuildConfig;
public class Constants { public class Constants {
public static final int MAX_REFERENCE_VERSION = 202414 * 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 GMS_PACKAGE_NAME = "com.google.android.gms";
public static final String GSF_PACKAGE_NAME = "com.mgoogle.android.gsf"; public static final String GSF_PACKAGE_NAME = "com.mgoogle.android.gsf";
public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788"; public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788";
@Deprecated
public static final int MAX_REFERENCE_VERSION = GMS_VERSION_CODE;
} }

View File

@ -37,5 +37,6 @@ android {
dependencies { dependencies {
api project(':play-services-basement') api project(':play-services-basement')
api project(':play-services-base-api') api project(':play-services-base-api')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -37,4 +37,4 @@ dependencies {
api project(':play-services-base-api') api project(':play-services-base-api')
api project(':play-services-cast-api') api project(':play-services-cast-api')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -16,15 +16,6 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
String getMyVersionName() {
def stdout = new ByteArrayOutputStream()
if (rootProject.file("gradlew").exists())
exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }
else // automatic build system, don't tag dirty
exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }
return stdout.toString().trim().substring(1)
}
android { android {
compileSdkVersion androidCompileSdk compileSdkVersion androidCompileSdk
buildToolsVersion "$androidBuildVersionTools" buildToolsVersion "$androidBuildVersionTools"
@ -44,4 +35,4 @@ android {
dependencies { dependencies {
api project(':play-services-base') api project(':play-services-base')
api project(':play-services-cast-api') api project(':play-services-cast-api')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -16,10 +16,14 @@ wire {
} }
} }
sourceSets {
main.java.srcDirs += "$buildDir/generated/source/wire"
}
compileKotlin { compileKotlin {
kotlinOptions.jvmTarget = 1.8 kotlinOptions.jvmTarget = 1.8
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.jvmTarget = 1.8 kotlinOptions.jvmTarget = 1.8
} }

View File

@ -16,21 +16,17 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
dependencies { dependencies {
implementation 'com.squareup.wire:wire-runtime:3.6.0' implementation 'com.squareup.wire:wire-runtime:3.6.1'
implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation "org.microg.gms:conscrypt-gmscore:2.5.1"
implementation "androidx.annotation:annotation:$annotationVersion"
// TODO: Switch to upstream once raw requests are merged // TODO: Switch to upstream once raw requests are merged
// https://github.com/vitalidze/chromecast-java-api-v2/pull/99 // https://github.com/vitalidze/chromecast-java-api-v2/pull/99
// implementation "su.litvak.chromecast:api-v2:0.10.4" // implementation "su.litvak.chromecast:api-v2:0.10.4"
implementation "info.armills.chromecast-java-api-v2:api-v2-raw-request:0.10.4-raw-request-1" implementation "info.armills.chromecast-java-api-v2:api-v2-raw-request:0.10.4-raw-request-1"
// Specified manually due to
// https://github.com/vitalidze/chromecast-java-api-v2/issues/91
implementation project(':play-services-core-proto') implementation project(':play-services-core-proto')
implementation project(':play-services-core:microg-ui-tools') // deprecated implementation project(':play-services-core:microg-ui-tools') // deprecated
implementation project(':play-services-api') implementation project(':play-services-api')
@ -38,17 +34,21 @@ dependencies {
// AndroidX UI // AndroidX UI
implementation "androidx.appcompat:appcompat:1.2.0" implementation "androidx.appcompat:appcompat:1.2.0"
implementation "androidx.mediarouter:mediarouter:1.2.2" implementation 'androidx.mediarouter:mediarouter:1.2.2'
implementation "androidx.preference:preference-ktx:$preferenceVersion" implementation "androidx.preference:preference-ktx:$preferenceVersion"
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3' implementation "org.microg.gms:conscrypt-gmscore:2.5.1"
implementation 'androidx.navigation:navigation-ui-ktx:2.3.3' implementation "androidx.annotation:annotation:$annotationVersion"
implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
// Navigation
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31'
implementation project(path: ':play-services-basement')
api project(':play-services-location-api') api project(':play-services-basement')
} }
android { android {
@ -101,4 +101,4 @@ android {
if (file('user.gradle').exists()) { if (file('user.gradle').exists()) {
apply from: 'user.gradle' apply from: 'user.gradle'
} }

View File

@ -58,7 +58,7 @@ public class AuthRequest extends HttpFormClient.Request {
@RequestContent("lang") @RequestContent("lang")
public String locale; public String locale;
@RequestContent("google_play_services_version") @RequestContent("google_play_services_version")
public int gmsVersion = Constants.MAX_REFERENCE_VERSION; public int gmsVersion = Constants.GMS_VERSION_CODE;
@RequestContent("accountType") @RequestContent("accountType")
public String accountType; public String accountType;
@RequestContent("Email") @RequestContent("Email")

View File

@ -74,7 +74,7 @@ import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; 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.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 class LoginActivity extends AssistantActivity {
public static final String TMPL_NEW_ACCOUNT = "new_account"; public static final String TMPL_NEW_ACCOUNT = "new_account";
@ -484,7 +484,7 @@ public class LoginActivity extends AssistantActivity {
@JavascriptInterface @JavascriptInterface
public final int getPlayServicesVersionCode() { public final int getPlayServicesVersionCode() {
return MAX_REFERENCE_VERSION; return GMS_VERSION_CODE;
} }
@JavascriptInterface @JavascriptInterface

View File

@ -57,9 +57,10 @@ public class GServicesProvider extends ContentProvider {
public boolean onCreate() { public boolean onCreate() {
if (CheckinPrefs.get(getContext()).isEnabled()) { if (CheckinPrefs.get(getContext()).isEnabled()) {
getContext().sendOrderedBroadcast(new Intent(getContext(), org.microg.gms.checkin.TriggerReceiver.class), null); getContext().sendOrderedBroadcast(new Intent(getContext(), org.microg.gms.checkin.TriggerReceiver.class), null);
}
if (GcmPrefs.get(getContext()).isEnabled()) { if (GcmPrefs.get(getContext()).isEnabled()) {
getContext().sendBroadcast(new Intent(org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT, null, getContext(), org.microg.gms.gcm.TriggerReceiver.class)); getContext().sendBroadcast(new Intent(org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT, null, getContext(), org.microg.gms.gcm.TriggerReceiver.class));
}
} }
databaseHelper = new DatabaseHelper(getContext()); databaseHelper = new DatabaseHelper(getContext());

View File

@ -34,4 +34,4 @@ android {
dependencies { dependencies {
api project(':play-services-basement') api project(':play-services-basement')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -36,4 +36,4 @@ dependencies {
api project(':play-services-basement') api project(':play-services-basement')
api project(':play-services-base-api') api project(':play-services-base-api')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -37,4 +37,4 @@ dependencies {
api project(':play-services-location-api') api project(':play-services-location-api')
implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.annotation:annotation:1.1.0'
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -46,7 +46,7 @@ public abstract class GoogleLocationManagerClient extends GmsClient<IGoogleLocat
throws RemoteException { throws RemoteException {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("client_name", "locationServices"); bundle.putString("client_name", "locationServices");
broker.getGoogleLocationManagerService(callbacks, Constants.MAX_REFERENCE_VERSION, broker.getGoogleLocationManagerService(callbacks, Constants.GMS_VERSION_CODE,
getContext().getPackageName(), bundle); getContext().getPackageName(), bundle);
} }
} }

View File

@ -23,4 +23,4 @@ android {
dependencies { dependencies {
api project(':play-services-basement') api project(':play-services-basement')
} }

View File

@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mar-v-in POM_DEVELOPER_ID=mar-v-in
POM_DEVELOPER_NAME=Marvin W POM_DEVELOPER_NAME=Marvin W

View File

@ -1,21 +1,22 @@
include ':play-services-basement' include ':play-services-basement'
include ':play-services-api' include ':play-services-tasks'
include ':play-services-cast'
include ':play-services-base-api'
include ':play-services-cast-api' include ':play-services-cast-api'
include ':play-services-cast-framework-api' include ':play-services-cast-framework-api'
include ':play-services-droidguard-api'
include ':play-services-iid-api' include ':play-services-iid-api'
include ':play-services-location-api' include ':play-services-location-api'
include ':play-services-location'
include ':play-services-api'
include ':play-services-core-proto'
include ':play-services-core:microg-ui-tools' // Legacy
include ':play-services-core'
include ':play-services-base' include ':play-services-base'
include ':play-services-base-api' include ':play-services-cast'
include ':play-services-tasks' include ':play-services-droidguard'
include ':play-services-core-proto' include ':play-services-location'
include ':play-services-conscrypt-provider-core'
include ':play-services-core'
include ':play-services-core:microg-ui-tools'