Merge pull request #17 from X1nto/master

Removed retarded versioning
This commit is contained in:
KevinX8 2020-07-21 17:17:51 +03:00 committed by GitHub
commit b5e5072ba2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 23 deletions

View File

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

View File

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