diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 02f9e12f..00000000 --- a/.travis.yml +++ /dev/null @@ -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 diff --git a/build.gradle b/build.gradle index b70af530..8558d6c3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,24 +4,24 @@ */ buildscript { - ext.safeParcelVersion = '1.6.0' + ext.safeParcelVersion = '1.7.0' ext.kotlinVersion = '1.4.31' ext.coroutineVersion = '1.3.7' ext.annotationVersion = '1.1.0' - ext.appcompatVersion = '1.1.0' + ext.appcompatVersion = '1.2.0' ext.fragmentVersion = '1.3.0' ext.lifecycleVersion = '2.3.0' - ext.mediarouterVersion = '1.1.0' - ext.navigationVersion = '2.3.0' + ext.mediarouterVersion = '1.2.0' + ext.navigationVersion = '2.3.1' ext.preferenceVersion = '1.1.1' ext.recyclerviewVersion = '1.1.0' ext.supportLibraryVersion = "28.0.0" ext.wireVersion = '3.2.2' - ext.androidBuildGradleVersion = "4.0.1" + ext.androidBuildGradleVersion = "4.1.0" ext.androidBuildVersionTools = "29.0.3" @@ -45,8 +45,8 @@ allprojects { apply plugin: 'idea' group = 'org.microg.gms' - version = "0.2.16.204713" - ext.appVersionCode = 204713001 + version = "0.2.18.210390" + ext.appVersionCode = 210390001 ext.isReleaseVersion = false } @@ -55,5 +55,4 @@ subprojects { jcenter() google() } -} - +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb1c2da9..c984a6e2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Dec 27 23:11:46 GMT 2020 +#Sat Mar 13 21:39:25 CET 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle index 778f7cea..891b041c 100644 --- a/play-services-api/build.gradle +++ b/play-services-api/build.gradle @@ -38,4 +38,4 @@ dependencies { api project(':play-services-cast-framework-api') api project(':play-services-iid-api') api project(':play-services-location-api') -} +} \ No newline at end of file diff --git a/play-services-api/gradle.properties b/play-services-api/gradle.properties index 221fda84..cac2a521 100644 --- a/play-services-api/gradle.properties +++ b/play-services-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-base-api/build.gradle b/play-services-base-api/build.gradle index 70d9d624..ba889533 100644 --- a/play-services-base-api/build.gradle +++ b/play-services-base-api/build.gradle @@ -37,4 +37,4 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } -} +} \ No newline at end of file diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle index 1ac08ee7..7938f2e7 100644 --- a/play-services-base/build.gradle +++ b/play-services-base/build.gradle @@ -33,10 +33,12 @@ android { } dependencies { + implementation 'com.google.android.gms:play-services-base:17.6.0' + api project(':play-services-basement') api project(':play-services-tasks') 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' -} +} \ No newline at end of file diff --git a/play-services-base/gradle.properties b/play-services-base/gradle.properties index b31a23e5..6949ecb1 100644 --- a/play-services-base/gradle.properties +++ b/play-services-base/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file 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 02116217..4f2f05c5 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -38,6 +38,7 @@ android { versionName version minSdkVersion androidMinSdk targetSdkVersion androidTargetSdk + buildConfigField "int", "VERSION_CODE", "$appVersionCode" } sourceSets { @@ -48,4 +49,4 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } -} +} \ No newline at end of file diff --git a/play-services-basement/gradle.properties b/play-services-basement/gradle.properties index c18a7f49..f7f3ecc1 100644 --- a/play-services-basement/gradle.properties +++ b/play-services-basement/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file 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 3bec84eb..d498328c 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 @@ -31,6 +31,7 @@ import java.util.Arrays; import kotlin.Suppress; +@SuppressWarnings("deprecation") public class GetServiceRequest extends AutoSafeParcelable { @SafeParceled(1) private int versionCode = 3; @@ -61,12 +62,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; } @Override 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 c57c81ce..881ac540 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 = 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 GSF_PACKAGE_NAME = "com.mgoogle.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-cast-api/build.gradle b/play-services-cast-api/build.gradle index b0b70bcb..6cfc38d1 100644 --- a/play-services-cast-api/build.gradle +++ b/play-services-cast-api/build.gradle @@ -37,5 +37,6 @@ android { dependencies { api project(':play-services-basement') + api project(':play-services-base-api') -} +} \ No newline at end of file diff --git a/play-services-cast-api/gradle.properties b/play-services-cast-api/gradle.properties index 18ff0a50..f2736ebf 100644 --- a/play-services-cast-api/gradle.properties +++ b/play-services-cast-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-cast-framework-api/build.gradle b/play-services-cast-framework-api/build.gradle index 9db7c812..bf519984 100644 --- a/play-services-cast-framework-api/build.gradle +++ b/play-services-cast-framework-api/build.gradle @@ -37,4 +37,4 @@ dependencies { api project(':play-services-base-api') api project(':play-services-cast-api') -} +} \ No newline at end of file diff --git a/play-services-cast-framework-api/gradle.properties b/play-services-cast-framework-api/gradle.properties index 54557daf..69ae4836 100644 --- a/play-services-cast-framework-api/gradle.properties +++ b/play-services-cast-framework-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-cast/build.gradle b/play-services-cast/build.gradle index 915202cd..e174c3c7 100755 --- a/play-services-cast/build.gradle +++ b/play-services-cast/build.gradle @@ -16,15 +16,6 @@ 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 { compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -44,4 +35,4 @@ android { dependencies { api project(':play-services-base') api project(':play-services-cast-api') -} +} \ No newline at end of file diff --git a/play-services-cast/gradle.properties b/play-services-cast/gradle.properties index 937fcc06..85daef1f 100755 --- a/play-services-cast/gradle.properties +++ b/play-services-cast/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-core-proto/build.gradle b/play-services-core-proto/build.gradle index 3ae24b59..2cfb351e 100644 --- a/play-services-core-proto/build.gradle +++ b/play-services-core-proto/build.gradle @@ -16,10 +16,14 @@ wire { } } +sourceSets { + main.java.srcDirs += "$buildDir/generated/source/wire" +} + compileKotlin { kotlinOptions.jvmTarget = 1.8 } compileTestKotlin { kotlinOptions.jvmTarget = 1.8 -} +} \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 5ea27117..1d07b824 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -16,21 +16,17 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' 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 "org.microg.gms:conscrypt-gmscore:2.5.1" - implementation "androidx.annotation:annotation:$annotationVersion" // TODO: Switch to upstream once raw requests are merged // https://github.com/vitalidze/chromecast-java-api-v2/pull/99 // 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" - // 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:microg-ui-tools') // deprecated implementation project(':play-services-api') @@ -38,17 +34,21 @@ dependencies { // AndroidX UI 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.navigation:navigation-fragment-ktx:2.3.3' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.3' + implementation "org.microg.gms:conscrypt-gmscore:2.5.1" + 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 '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 { @@ -101,4 +101,4 @@ android { if (file('user.gradle').exists()) { apply from: 'user.gradle' -} +} \ No newline at end of file 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 e63c2223..25f79817 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 @@ -74,7 +74,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"; @@ -484,7 +484,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/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java index d5245318..6b3d8b85 100644 --- a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java +++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java @@ -57,9 +57,10 @@ public class GServicesProvider extends ContentProvider { public boolean onCreate() { if (CheckinPrefs.get(getContext()).isEnabled()) { getContext().sendOrderedBroadcast(new Intent(getContext(), org.microg.gms.checkin.TriggerReceiver.class), null); - } - 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)); + + 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)); + } } databaseHelper = new DatabaseHelper(getContext()); diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle index 7d1eb81f..e25a297b 100644 --- a/play-services-iid-api/build.gradle +++ b/play-services-iid-api/build.gradle @@ -34,4 +34,4 @@ android { dependencies { api project(':play-services-basement') -} +} \ No newline at end of file diff --git a/play-services-iid-api/gradle.properties b/play-services-iid-api/gradle.properties index d54aab99..9835eeac 100644 --- a/play-services-iid-api/gradle.properties +++ b/play-services-iid-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-location-api/build.gradle b/play-services-location-api/build.gradle index fb66e4c7..3917674a 100644 --- a/play-services-location-api/build.gradle +++ b/play-services-location-api/build.gradle @@ -36,4 +36,4 @@ dependencies { api project(':play-services-basement') api project(':play-services-base-api') -} +} \ No newline at end of file diff --git a/play-services-location-api/gradle.properties b/play-services-location-api/gradle.properties index de0a3085..cb75f79e 100644 --- a/play-services-location-api/gradle.properties +++ b/play-services-location-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle index 076fd90f..f4650885 100644 --- a/play-services-location/build.gradle +++ b/play-services-location/build.gradle @@ -37,4 +37,4 @@ dependencies { api project(':play-services-location-api') implementation 'androidx.annotation:annotation:1.1.0' -} +} \ No newline at end of file diff --git a/play-services-location/gradle.properties b/play-services-location/gradle.properties index bfc9b4b2..0b02e4ed 100644 --- a/play-services-location/gradle.properties +++ b/play-services-location/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file 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