diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml new file mode 100644 index 00000000..62035cf6 --- /dev/null +++ b/.github/workflows/debug.yml @@ -0,0 +1,37 @@ +name: Debug APK Builder + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: JDK 8 Setup + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Install NDK + run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" + + - name: Grant rights + run: chmod +x ./gradlew + + - name: Build project + run: ./gradlew build + + - name: Build APK + run: ./gradlew assembleDebug + + - name: Upload to Artifacts + uses: actions/upload-artifact@v2 + with: + name: 'MicroG' + path: play-services-core/build/outputs/apk/debug/play-services-core-debug.apk \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index daf99eeb..00000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: android -sudo: false -script: - - jdk_switcher use oraclejdk8 - - echo sdk.dir $ANDROID_HOME > local.properties - - export TERM=dumb - - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - - ./gradlew --stacktrace assemble -android: - components: - - tools - - platform-tools - - build-tools-29.0.3 - - android-29 - - extra-android-m2repository diff --git a/README.md b/README.md index 7f0d4764..9353dea7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Vanced MicroG -[![Build Status](https://api.travis-ci.com/YTVanced/VancedMicroG.svg?branch=master)](https://travis-ci.com/github/YTVanced/VancedMicroG) +![Build Status](https://github.com/YTVanced/VancedMicroG/workflows/Debug$20APK%20Builder/badge.svg?branch=master) [![Github All Releases](https://img.shields.io/github/downloads/YTVanced/VancedMicroG/total.svg)]() [![Github All Releases](https://img.shields.io/github/release/YTVanced/VancedMicroG.svg)]() 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 b99f21f1..a59a5b6b 100644 --- a/build.gradle +++ b/build.gradle @@ -25,11 +25,11 @@ buildscript { ext.supportLibraryVersion = "28.0.0" ext.slf4jVersion = "1.7.25" - ext.androidBuildGradleVersion = "3.6.3" + ext.androidBuildGradleVersion = "4.0.1" ext.androidBuildVersionTools = "29.0.3" - ext.androidMinSdk = 14 + ext.androidMinSdk = 21 ext.androidTargetSdk = 29 ext.androidCompileSdk = 29 @@ -53,11 +53,10 @@ def execResult(...args) { return stdout.toString().trim() } -def gmsVersion = "19.4.20" +def gmsVersion = "69.4.20" 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")) -def gitCommitId = execResult('git', 'show-ref', '--abbrev=7', '--head', 'HEAD').split(' ')[0] def gitDirty = execResult('git', 'status', '--porcelain').size() > 0 def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.')) def ourVersionMinor = Integer.parseInt(ourVersionBase.substring(ourVersionBase.lastIndexOf('.') + 1)) @@ -65,17 +64,6 @@ def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2 + (gitCommitCo def ourVersionName = "$ourVersionBase.$gmsVersionCode" + "-vanced" logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode) -@Deprecated -String getMyVersionName() { - return ourVersionName -} - -@Deprecated -int getMyVersionCode() { - return ourVersionCode -} - - allprojects { apply plugin: 'idea' @@ -85,25 +73,6 @@ allprojects { ext.isReleaseVersion = false } -@Deprecated -def androidCompileSdk() { return androidCompileSdk } - -@Deprecated -def androidTargetSdk() { return androidTargetSdk } - -@Deprecated -def androidMinSdk() { return androidMinSdk } - -@Deprecated -def versionCode() { - return ourVersionCode -} - -@Deprecated -def versionName() { - return ourVersionName -} - subprojects { repositories { jcenter() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 21a8fe40..902880e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Jul 21 13:31:11 GET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip diff --git a/play-services-base-core/src/main/res/drawable/ic_foreground_notification.xml b/play-services-base-core/src/main/res/drawable/ic_foreground_notification.xml index ec4310fd..efa909af 100644 --- a/play-services-base-core/src/main/res/drawable/ic_foreground_notification.xml +++ b/play-services-base-core/src/main/res/drawable/ic_foreground_notification.xml @@ -1,13 +1,12 @@ - - - - - - + + + + + diff --git a/play-services-base-core/src/main/res/drawable/ic_microg.xml b/play-services-base-core/src/main/res/drawable/ic_microg.xml deleted file mode 100644 index dd607418..00000000 --- a/play-services-base-core/src/main/res/drawable/ic_microg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle index 7bdaad9f..27a432be 100644 --- a/play-services-base/build.gradle +++ b/play-services-base/build.gradle @@ -37,4 +37,5 @@ dependencies { api project(':play-services-tasks') implementation "androidx.fragment:fragment:$fragmentVersion" + implementation "com.google.android.gms:play-services-base:17.3.0" } diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index e88b1909..771415d5 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -22,7 +22,7 @@ dependencies { api "org.microg:safe-parcel:$safeParcelVersion" implementation "androidx.annotation:annotation:$annotationVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" } android { diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index e9e4f94b..8e1bc75c 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -43,7 +43,7 @@ dependencies { } android { - compileSdkVersion androidCompileSdk() + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" defaultConfig { @@ -53,17 +53,16 @@ android { minSdkVersion androidMinSdk targetSdkVersion androidTargetSdk -// buildConfigField "boolean", "USE_MAPBOX", "${useMapbox()}" - multiDexEnabled true ndk { - abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64" + abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } + } - dataBinding { - enabled = true + buildFeatures { + dataBinding = true } sourceSets { @@ -78,7 +77,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 375af576..7b4a8055 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -79,7 +79,7 @@ android:allowBackup="false" android:extractNativeLibs="true" android:icon="@mipmap/ic_launcher" - android:label="Vanced microG"> + android:label="@string/app_name"> @@ -279,7 +279,7 @@ android:name="org.microg.gms.ui.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/gms_settings_name" - android:roundIcon="@mipmap/ic_microg_settings" + android:roundIcon="@mipmap/ic_launcher" android:theme="@style/Theme.AppCompat.DayNight"> diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java index 77973ba5..9e0da3ea 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java @@ -319,24 +319,10 @@ public class McsService extends Service implements Handler.Callback { return START_REDELIVER_INTENT; } - @RequiresApi(api = Build.VERSION_CODES.O) - private Notification buildForegroundNotification() { - NotificationChannel channel = new NotificationChannel("foreground-service", "Foreground Service", NotificationManager.IMPORTANCE_MIN); - channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET); - channel.setShowBadge(false); - getSystemService(NotificationManager.class).createNotificationChannel(channel); - return new Notification.Builder(this, channel.getId()) - .setOngoing(true) - .setContentTitle("Running in background") - .setSmallIcon(R.drawable.ic_microg) - .build(); - } - private void handleSendMessage(Intent intent) { String messageId = intent.getStringExtra(EXTRA_MESSAGE_ID); String collapseKey = intent.getStringExtra(EXTRA_COLLAPSE_KEY); - Messenger messenger = intent.getParcelableExtra(EXTRA_MESSENGER); intent.removeExtra(EXTRA_MESSENGER); Parcelable app = intent.getParcelableExtra(EXTRA_APP); diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml index 6ef04c35..44801f8a 100644 --- a/play-services-core/src/main/res/layout/ask_permission.xml +++ b/play-services-core/src/main/res/layout/ask_permission.xml @@ -75,7 +75,7 @@ android:padding="10dp"> diff --git a/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml b/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml deleted file mode 100644 index bcdc5a25..00000000 --- a/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png b/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png deleted file mode 100644 index 47a7303a..00000000 Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png and /dev/null differ diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_launcher.png b/play-services-core/src/main/res/mipmap-hdpi/ic_launcher.png index 25d30bea..31758af3 100644 Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_launcher.png and b/play-services-core/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png deleted file mode 100644 index 503ae018..00000000 Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png and /dev/null differ diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png deleted file mode 100644 index 9087dc6f..00000000 Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png and /dev/null differ diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png deleted file mode 100644 index 4b32cbbf..00000000 Binary files a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png and /dev/null differ diff --git a/play-services-core/src/main/res/mipmap-mdpi/ic_launcher.png b/play-services-core/src/main/res/mipmap-mdpi/ic_launcher.png index 16aa4cec..d1d0e6f2 100644 Binary files a/play-services-core/src/main/res/mipmap-mdpi/ic_launcher.png and b/play-services-core/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/play-services-core/src/main/res/mipmap-xhdpi/ic_launcher.png b/play-services-core/src/main/res/mipmap-xhdpi/ic_launcher.png index d364d9bc..6aec4d5a 100644 Binary files a/play-services-core/src/main/res/mipmap-xhdpi/ic_launcher.png and b/play-services-core/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/play-services-core/src/main/res/mipmap-xxhdpi/ic_launcher.png b/play-services-core/src/main/res/mipmap-xxhdpi/ic_launcher.png index 0e767f01..f8dedac2 100644 Binary files a/play-services-core/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/play-services-core/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/play-services-core/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/play-services-core/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b686543e..efbb9ac4 100644 Binary files a/play-services-core/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/play-services-core/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/play-services-core/src/main/res/values/resources.xml b/play-services-core/src/main/res/values/resources.xml new file mode 100644 index 00000000..73f39f80 --- /dev/null +++ b/play-services-core/src/main/res/values/resources.xml @@ -0,0 +1,6 @@ + + + + Vanced microG + + \ No newline at end of file diff --git a/play-services-core/src/main/res/xml/authenticator.xml b/play-services-core/src/main/res/xml/authenticator.xml index 0d178afc..72809e56 100644 --- a/play-services-core/src/main/res/xml/authenticator.xml +++ b/play-services-core/src/main/res/xml/authenticator.xml @@ -21,4 +21,4 @@ android:customTokens="true" android:icon="@mipmap/ic_launcher" android:smallIcon="@mipmap/ic_launcher" - android:label="Vanced microG" /> + android:label="@string/app_name" /> diff --git a/proguard.flags b/proguard.flags index 17f1d2ea..86ac77f3 100644 --- a/proguard.flags +++ b/proguard.flags @@ -17,10 +17,7 @@ -dontnote # Keep dynamically loaded GMS classes --keep public class com.google.android.gms.maps.internal.CreatorImpl { public *; } -keep public class com.google.android.gms.common.security.ProviderInstallerImpl { public *; } --keep public class com.google.android.gms.plus.plusone.PlusOneButtonCreatorImpl { public *; } --keep public class com.google.android.gms.chimera.container.DynamiteLoaderImpl { public *; } -keep public class com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl { public *; } # Keep AutoSafeParcelables