Merge pull request #16 from X1nto/master

Vanced MicroG 0.2.10.69420
This commit is contained in:
KevinX8 2020-07-21 16:22:49 +03:00 committed by GitHub
commit 323dc04bfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 69 additions and 119 deletions

37
.github/workflows/debug.yml vendored Normal file
View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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()

View File

@ -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

View File

@ -1,13 +1,12 @@
<vector android:height="30.287416dp" android:viewportHeight="1169.74"
android:viewportWidth="965.533" android:width="25dp"
<vector android:height="31dp" android:viewportHeight="1115"
android:viewportWidth="910.28" android:width="25.308233dp"
xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF"
android:pathData="m937.33,922.52c0.01,0.16 0.01,0.32 0,0.46 -0.04,31.65 2.1,100.42 -1.89,133.26 0.01,0.01 0,0.03 0,0.03 -8.86,49.71 -51.31,84.66 -107.91,85.19 -111.09,1.05 -222.21,0.29 -333.32,0.29 0,0 -109.2,0.49 -163.79,0.49 0,0 -0.01,-0.01 -0.03,0 -48.3,0 -96.62,-0.04 -144.92,-0.17 -9.79,-0.03 -19.62,-0.32 -29.4,-0.9 -8.38,-0.47 -16.75,-1.19 -25.08,-2.15 -52.64,-6.06 -89.27,-38.11 -99.79,-85.57 0,-0.01 -0.01,-0.04 -0.01,-0.07 -1.91,-8.55 -2.95,-17.61 -3.1,-27.1 -0.69,-46.45 -0.54,-92.94 -0.26,-139.41v-0.19c0.03,-5.39 0.06,-10.76 0.1,-16.15 0.23,-33.27 4.4,-36.94 38.49,-37.67 17.29,-0.37 34.66,0.27 51.89,-1.06 103.35,-8.07 167.98,-114.53 122.18,-207.76 -22.77,-46.34 -62.96,-77.72 -119.02,-79.53 -22.75,-0.73 -45.52,-0.92 -68.29,-1.05 -16.91,-0.11 -25.09,-8.34 -25.03,-25.19 0.07,-18.83 -0.11,-37.69 -0.3,-56.53v-0.4c-0.33,-31.19 -0.64,-62.37 0.14,-93.5v-0.09c0.29,-11.75 1.6,-37.93 1.73,-39.28 0,0 0,-0.01 0,-0.03 5.53,-58.56 56.56,-92.89 115.32,-88.67 60.99,1.61 121.9,2.21 182.87,2.61 22.15,0.14 29.35,-13.14 30.51,-33.49 1.79,-31.7 2.45,-63.85 8.65,-94.8 8.88,-44.29 45.26,-86.63 104.39,-86.59 62.16,0.19 113.83,33 125.91,84.63 7.16,30.66 8.96,62.86 10.3,94.5 0.92,21.84 8.4,33.33 27.12,35.81h0.01c2.79,0.39 5.82,0.56 9.13,0.53 55.07,-0.4 110.13,-0.57 165.18,0.54 8.38,0.47 16.75,1.19 25.08,2.15 52.64,6.06 89.27,38.11 99.79,85.57 1.13,7.05 2.02,14.69 2.68,22.93 0.32,46.27 0.54,93.74 0.69,141.91v0.43c0.41,140.33 0.21,286.54 -0.02,426.02z" android:strokeWidth="55">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1436.4504" android:endY="668.0306"
android:startX="560.4707" android:startY="1544.0103" android:type="linear">
<item android:color="#FF3370FA" android:offset="1.065558E-7"/>
<item android:color="#FFF80439" android:offset="1"/>
<path android:pathData="M909.73,895.2v0.5c0,31.7 2.1,100.4 -1.9,133.3h0c-8.9,49.7 -51.3,84.7 -107.9,85.2 -111.1,1.1 -222.2,0.3 -333.3,0.3 0,0 -109.2,0.5 -163.8,0.5h0q-72.45,0 -144.9,-0.2 -14.7,0 -29.4,-0.9c-8.4,-0.5 -16.8,-1.2 -25.1,-2.2 -52.6,-6.1 -89.3,-38.1 -99.8,-85.6v-0.1a131.48,131.48 0,0 1,-3.1 -27.1c-0.7,-46.4 -0.5,-92.9 -0.3,-139.4v-0.2c0,-5.4 0.1,-10.8 0.1,-16.2 0.2,-33.3 4.4,-36.9 38.5,-37.7 17.3,-0.4 34.7,0.3 51.9,-1.1 103.3,-8.1 168,-114.5 122.2,-207.8 -22.8,-46.3 -63,-77.7 -119,-79.5 -22.8,-0.7 -45.5,-0.9 -68.3,-1 -16.9,-0.1 -25.1,-8.3 -25,-25.2 0.1,-18.8 -0.1,-37.7 -0.3,-56.5v-0.4c-0.3,-31.2 -0.6,-62.4 0.1,-93.5v-0.1c0.3,-11.8 1.6,-37.9 1.7,-39.3h0c5.5,-58.6 56.6,-92.9 115.3,-88.7 61,1.6 121.9,2.2 182.9,2.6 22.2,0.1 29.3,-13.1 30.5,-33.5 1.8,-31.7 2.5,-63.8 8.7,-94.8 8.9,-44.3 45.3,-86.6 104.4,-86.6 62.2,0.2 113.8,33 125.9,84.6 7.2,30.7 9,62.9 10.3,94.5 0.9,21.8 8.4,33.3 27.1,35.8h0a52.59,52.59 0,0 0,9.1 0.5c55.1,-0.4 110.1,-0.6 165.2,0.5 8.4,0.5 16.8,1.2 25.1,2.2 52.6,6.1 89.3,38.1 99.8,85.6 1.1,7 2,14.7 2.7,22.9 0.3,46.3 0.5,93.7 0.7,141.9v0.4C910.13,609.5 909.93,755.7 909.73,895.2Z">
<aapt:attr name="android:fillColor">
<gradient android:endX="872.2" android:endY="244.86"
android:startX="34.99003" android:startY="1082.07" android:type="linear">
<item android:color="#FF366EF7" android:offset="0"/>
<item android:color="#FFF7043A" android:offset="1"/>
</gradient>
</aapt:attr>
</path>

View File

@ -1,24 +0,0 @@
<vector android:height="25dp" android:viewportHeight="2000"
android:viewportWidth="2000" android:width="25dp"
xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#0C0C0F"
android:pathData="M1000,1000m-852.75,0a852.75,852.75 0,1 1,1705.5 0a852.75,852.75 0,1 1,-1705.5 0" android:strokeWidth="70">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1627.734" android:endY="372.266"
android:startX="372.266" android:startY="1627.734" android:type="linear">
<item android:color="#FF3370FA" android:offset="1.118836E-7"/>
<item android:color="#FFF80439" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#00000000"
android:pathData="M1454.65,1337.65c0.01,0.16 0.01,0.32 0,0.46c-0.04,31.65 2.1,100.42 -1.89,133.26c0.01,0.01 0,0.03 0,0.03c-8.86,49.71 -51.31,84.66 -107.91,85.19c-111.09,1.05 -222.21,0.29 -333.32,0.29c0,0 -109.2,0.49 -163.79,0.49c0,0 -0.01,-0.01 -0.03,0c-48.3,0 -96.62,-0.04 -144.92,-0.17c-9.79,-0.03 -19.62,-0.32 -29.4,-0.9c-8.38,-0.47 -16.75,-1.19 -25.08,-2.15c-52.64,-6.06 -89.27,-38.11 -99.79,-85.57c0,-0.01 -0.01,-0.04 -0.01,-0.07c-1.91,-8.55 -2.95,-17.61 -3.1,-27.1c-0.69,-46.45 -0.54,-92.94 -0.26,-139.41v-0.19c0.03,-5.39 0.06,-10.76 0.1,-16.15c0.23,-33.27 4.4,-36.94 38.49,-37.67c17.29,-0.37 34.66,0.27 51.89,-1.06c103.35,-8.07 167.98,-114.53 122.18,-207.76c-22.77,-46.34 -62.96,-77.72 -119.02,-79.53c-22.75,-0.73 -45.52,-0.92 -68.29,-1.05c-16.91,-0.11 -25.09,-8.34 -25.03,-25.19c0.07,-18.83 -0.11,-37.69 -0.3,-56.53v-0.4c-0.33,-31.19 -0.64,-62.37 0.14,-93.5v-0.09c0.29,-11.75 1.6,-37.93 1.73,-39.28c0,0 0,-0.01 0,-0.03c5.53,-58.56 56.56,-92.89 115.32,-88.67c60.99,1.61 121.9,2.21 182.87,2.61c22.15,0.14 29.35,-13.14 30.51,-33.49c1.79,-31.7 2.45,-63.85 8.65,-94.8c8.88,-44.29 45.26,-86.63 104.39,-86.59c62.16,0.19 113.83,33 125.91,84.63c7.16,30.66 8.96,62.86 10.3,94.5c0.92,21.84 8.4,33.33 27.12,35.81h0.01c2.79,0.39 5.82,0.56 9.13,0.53c55.07,-0.4 110.13,-0.57 165.18,0.54c8.38,0.47 16.75,1.19 25.08,2.15c52.64,6.06 89.27,38.11 99.79,85.57c1.13,7.05 2.02,14.69 2.68,22.93c0.32,46.27 0.54,93.74 0.69,141.91v0.43C1455.08,1051.96 1454.88,1198.17 1454.65,1337.65z" android:strokeWidth="55">
<aapt:attr name="android:strokeColor">
<gradient android:endX="1436.4504" android:endY="668.0306"
android:startX="560.4707" android:startY="1544.0103" android:type="linear">
<item android:color="#FF3370FA" android:offset="1.065558E-7"/>
<item android:color="#FFF80439" android:offset="1"/>
</gradient>
</aapt:attr>
</path>
</vector>

View File

@ -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"
}

View File

@ -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 {

View File

@ -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'
}
}

View File

@ -79,7 +79,7 @@
android:allowBackup="false"
android:extractNativeLibs="true"
android:icon="@mipmap/ic_launcher"
android:label="Vanced microG">
android:label="@string/app_name">
<meta-data
android:name="fake-signature"
android:value="@string/fake_signature" />
@ -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">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />

View File

@ -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);

View File

@ -75,7 +75,7 @@
android:padding="10dp">
<ImageView
android:src="@mipmap/ic_core_service_app"
android:src="@mipmap/ic_launcher"
android:id="@+id/app_icon"
android:layout_width="match_parent"
android:layout_height="match_parent" />

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon
xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_microg_background" />
<foreground android:drawable="@mipmap/ic_microg_foreground" />
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Vanced microG</string>
</resources>

View File

@ -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" />

View File

@ -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