forked from Blendman974/faceclaw
[verified] merge upstream c162c8e6 into all-features
This commit is contained in:
commit
5790e98d27
176 files changed
+5311
-2307
No files matched your search
@@ -272,15 +272,21 @@ if (faceclawVersionFile.exists()) {
|
||||
faceclawVersionName = faceclawVersionMatch.group(1)
|
||||
}
|
||||
}
|
||||
def faceclawBuildRevision = System.getenv("FACECLAW_ANDROID_BUILD_REVISION") ?: "0"
|
||||
if (!(faceclawBuildRevision ==~ /[0-4]/)) {
|
||||
throw new GradleException("FACECLAW_ANDROID_BUILD_REVISION must be an integer from 0 to 4")
|
||||
}
|
||||
def faceclawVersionCode = {
|
||||
// Prerelease labels belong in versionName, not the numeric versionCode.
|
||||
def parts = (faceclawVersionName.split('-')[0].tokenize('.') + ["0", "0"]).take(3)*.toInteger()
|
||||
return parts[0] * 10000 + parts[1] * 100 + parts[2]
|
||||
// Last digit: build revision * 2, plus form factor (phone 0, Wear OS 1).
|
||||
// Play requires distinct version codes even on separate form-factor tracks.
|
||||
return (parts[0] * 10000 + parts[1] * 100 + parts[2]) * 10 + faceclawBuildRevision.toInteger() * 2
|
||||
}()
|
||||
|
||||
android {
|
||||
compileSdkVersion 35
|
||||
buildToolsVersion "35"
|
||||
compileSdkVersion 36
|
||||
buildToolsVersion "36.0.0"
|
||||
// ndkVersion ""
|
||||
|
||||
sourceSets.main {
|
||||
@@ -290,7 +296,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 24
|
||||
targetSdkVersion 35
|
||||
targetSdkVersion 36
|
||||
ndk {
|
||||
// The NativeScript platform build.gradle has already added all four
|
||||
// ABIs by the time app.gradle is applied, and abiFilters is additive,
|
||||
|
||||
Reference in new issue
Block a user