etc/VancedMicroG
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedMicroG synced 2024-11-12 22:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #152 from Oizaro/master

Browse source 
Update to latest upstream
This commit is contained in:
KevinX8 2021-07-03 09:25:58 +01:00 committed by GitHub
commit 42cde92013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -36,7 +36,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri May 14 01:45:11 CEST 2021
#Sat Jul 03 09:49:43 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

1
play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
View file

@ -30,6 +30,7 @@ public class AboutFragment extends AbstractAboutFragment {
libraries.add(new AbstractAboutFragment.Library("de.hdodenhof.circleimageview", "CircleImageView", "Apache License 2.0, Henning Dodenhof"));
libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak"));
libraries.add(new AbstractAboutFragment.Library("org.conscrypt", "Conscrypt", "Apache License 2.0, The Android Open Source Project"));
libraries.add(new AbstractAboutFragment.Library("org.chromium.net", "Cronet", "BSD-style License, The Chromium Authors"));
libraries.add(new AbstractAboutFragment.Library("org.microg.safeparcel", "SafeParcel", "Apache License 2.0, microG Team"));
libraries.add(new AbstractAboutFragment.Library("com.squareup.wire", "Wire Protocol Buffers", "Apache License 2.0, Square Inc."));
}

6
play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt
View file

@ -134,9 +134,9 @@ class SettingsProvider : ContentProvider() {
Gcm.NETWORK_ROAMING -> Integer.parseInt(preferences.getString(key, "0") ?: "0")
Gcm.NETWORK_OTHER -> Integer.parseInt(preferences.getString(key, "0") ?: "0")
Gcm.LEARNT_MOBILE -> preferences.getInt(key, 300000)
Gcm.LEARNT_WIFI -> preferences.getInt(key, 300000)
Gcm.LEARNT_OTHER -> preferences.getInt(key, 300000)
Gcm.LEARNT_MOBILE -> preferences.getInt(key, 60000)
Gcm.LEARNT_WIFI -> preferences.getInt(key, 60000)
Gcm.LEARNT_OTHER -> preferences.getInt(key, 60000)
else -> throw IllegalArgumentException("Unknown key: $key")
}

6
play-services-cronet-core/build.gradle
View file

@ -8,7 +8,11 @@ apply plugin: 'maven-publish'
apply plugin: 'signing'
dependencies {
implementation("org.microg:cronet-api:$cronetVersion")
// TODO: Embedding the API causes random crashes as the Android AOT compiler will link the native implementation to
// out API classes even if embedded by a third-party app that comes with their own API classes.
// Need to find a better way to disable AOT for Cronet. Could be by packaging cronet as it's own apk that is
// embedded in the main APK but only loaded at runtime so that the AOT compiler has no way to become active.
// implementation("org.microg:cronet-api:$cronetVersion")
implementation("org.microg:cronet-common:$cronetVersion")
implementation("org.microg:cronet-native:$cronetVersion")
}