From 2517d1c98e2344971e1ca450f5b5a6f1c98fbe14 Mon Sep 17 00:00:00 2001 From: X1nto Date: Tue, 21 Jul 2020 17:29:09 +0400 Subject: [PATCH 1/2] fixed badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9353dea7..a7b9bcfa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Vanced MicroG -![Build Status](https://github.com/YTVanced/VancedMicroG/workflows/Debug$20APK%20Builder/badge.svg?branch=master) +![Build Status](https://github.com/YTVanced/VancedMicroG/workflows/Debug%20APK%20Builder/badge.svg) [![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. From 9375008e8983a15f933c6b7ae4439c5baaa2712b Mon Sep 17 00:00:00 2001 From: X1nto Date: Tue, 21 Jul 2020 18:04:17 +0400 Subject: [PATCH 2/2] removed retarded versioning --- build.gradle | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index a59a5b6b..a69d5f29 100644 --- a/build.gradle +++ b/build.gradle @@ -44,32 +44,12 @@ buildscript { } } -def execResult(...args) { - def stdout = new ByteArrayOutputStream() - exec { - commandLine args - standardOutput = stdout - } - return stdout.toString().trim() -} - -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 gitDirty = execResult('git', 'status', '--porcelain').size() > 0 -def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.')) -def ourVersionMinor = Integer.parseInt(ourVersionBase.substring(ourVersionBase.lastIndexOf('.') + 1)) -def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2 + (gitCommitCount > 0 || gitDirty ? 1 : 0) -def ourVersionName = "$ourVersionBase.$gmsVersionCode" + "-vanced" -logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode) - allprojects { apply plugin: 'idea' group = 'org.microg.gms' - version = ourVersionName - ext.appVersionCode = ourVersionCode + version = "0.2.10.19430-vanced" + ext.appVersionCode = 194301000 ext.isReleaseVersion = false }