mirror of
https://github.com/sudoxnym/fdroiddata.git
synced 2026-05-20 12:49:14 +00:00
Misc fixes for current cycle
This commit is contained in:
parent
4c448faa82
commit
b21d439187
11 changed files with 43 additions and 58 deletions
|
|
@ -170,9 +170,9 @@ Builds:
|
|||
- node_modules/
|
||||
- vendor/
|
||||
|
||||
- versionName: 3.0.18
|
||||
versionCode: 3000180
|
||||
commit: 777c57cb6f2a784a469df393d144ff7a614d1e1d
|
||||
- versionName: 3.0.21
|
||||
versionCode: 3000210
|
||||
commit: 3.0.21
|
||||
subdir: android/app/
|
||||
submodules: true
|
||||
sudo:
|
||||
|
|
@ -196,5 +196,5 @@ Builds:
|
|||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
CurrentVersion: 3.0.18
|
||||
CurrentVersionCode: 3000180
|
||||
CurrentVersion: 3.0.21
|
||||
CurrentVersionCode: 3000210
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ Builds:
|
|||
|
||||
- versionName: 3.7.0
|
||||
versionCode: 47
|
||||
disable: fails to build
|
||||
commit: 3.7.0
|
||||
output: build/app/outputs/apk/release/app-release.apk
|
||||
srclibs:
|
||||
|
|
|
|||
|
|
@ -146,6 +146,7 @@ Builds:
|
|||
|
||||
- versionName: 0.16.0
|
||||
versionCode: 53
|
||||
disable: fails to build
|
||||
commit: 0.16.0
|
||||
subdir: app
|
||||
gradle:
|
||||
|
|
|
|||
|
|
@ -44,17 +44,17 @@ Builds:
|
|||
- googlefit
|
||||
prebuild: sed -i -e '/googleFitImplementation/d' build.gradle
|
||||
|
||||
- versionName: v1.3.5
|
||||
- versionName: 1.3.5
|
||||
versionCode: 491
|
||||
commit: v1.3.5
|
||||
subdir: app
|
||||
gradle:
|
||||
- oss
|
||||
rm:
|
||||
- googlefit
|
||||
prebuild: sed -i -e '/googleFitImplementation/d' build.gradle
|
||||
scanignore:
|
||||
- buildSrc/build
|
||||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
AutoUpdateMode: None
|
||||
UpdateCheckMode: None
|
||||
CurrentVersion: v1.3.5
|
||||
CurrentVersionCode: 491
|
||||
|
|
|
|||
|
|
@ -38,12 +38,13 @@ Builds:
|
|||
|
||||
- versionName: 2.6.1
|
||||
versionCode: 39
|
||||
disable: non-FOSS libs
|
||||
commit: v2.6.1
|
||||
subdir: app/
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
AutoUpdateMode: Version v%v
|
||||
AutoUpdateMode: None
|
||||
UpdateCheckMode: Tags
|
||||
CurrentVersion: 2.6.1
|
||||
CurrentVersionCode: 39
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ Builds:
|
|||
|
||||
- versionName: '4.3'
|
||||
versionCode: 12
|
||||
disable: fails to build
|
||||
commit: '4.3'
|
||||
subdir: app
|
||||
sudo:
|
||||
|
|
|
|||
|
|
@ -19,14 +19,6 @@ Builds:
|
|||
gradle:
|
||||
- yes
|
||||
|
||||
- versionName: 0.2.6b
|
||||
versionCode: 78
|
||||
disable: fails to build
|
||||
commit: 0.2.6b
|
||||
subdir: app
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
- versionName: 0.2.8b
|
||||
versionCode: 81
|
||||
commit: 0.2.8b
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ Builds:
|
|||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt install -y build-essential
|
||||
- apt install -y -t stretch-backports-sloppy libarchive13
|
||||
- apt install -y -t stretch-backports cmake
|
||||
output: build/app/outputs/apk/release/app-release.apk
|
||||
srclibs:
|
||||
|
|
|
|||
|
|
@ -1,39 +1,28 @@
|
|||
--- a/app/build.gradle
|
||||
+++ b/app/build.gradle
|
||||
@@ -2,12 +2,6 @@
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
|
||||
-def keystorePropertiesFile = rootProject.file("keystore.properties")
|
||||
-def keystoreProperties = new Properties()
|
||||
-if (keystorePropertiesFile.exists()) {
|
||||
- keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
|
||||
-}
|
||||
-
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion "29.0.2"
|
||||
@@ -24,14 +18,6 @@
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
- if (keystorePropertiesFile.exists()) {
|
||||
- release {
|
||||
- keyAlias keystoreProperties['keyAlias']
|
||||
- keyPassword keystoreProperties['keyPassword']
|
||||
- storeFile file(keystoreProperties['storeFile'])
|
||||
- storePassword keystoreProperties['storePassword']
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
@@ -41,9 +27,6 @@
|
||||
--- a/android/app/build.gradle
|
||||
+++ b/android/app/build.gradle
|
||||
@@ -173,14 +173,6 @@
|
||||
// keyPassword 'android'
|
||||
// }
|
||||
release {
|
||||
minifyEnabled true
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
- if (keystorePropertiesFile.exists()) {
|
||||
- signingConfig signingConfigs.release
|
||||
- if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
|
||||
- storeFile file(MYAPP_RELEASE_STORE_FILE)
|
||||
- storePassword MYAPP_RELEASE_STORE_PASSWORD
|
||||
- keyAlias MYAPP_RELEASE_KEY_ALIAS
|
||||
- keyPassword MYAPP_RELEASE_KEY_PASSWORD
|
||||
- } else {
|
||||
- throw new Exception('Refusing to make release build with wrong keystore')
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -203,11 +195,6 @@
|
||||
// signingConfig signingConfigs.debug
|
||||
minifyEnabled enableProguardInReleaseBuilds
|
||||
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
||||
- if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
|
||||
- signingConfig signingConfigs.release
|
||||
- } else {
|
||||
- throw new Exception('Refusing to make release build with wrong keystore')
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ Builds:
|
|||
|
||||
- versionName: 2.14.1
|
||||
versionCode: 32
|
||||
commit: 2.14.1
|
||||
commit: 2.14.1-fdroid
|
||||
subdir: app
|
||||
gradle:
|
||||
- fdroid
|
||||
|
|
@ -139,6 +139,6 @@ Builds:
|
|||
- sed -i -e '/playImplementation(.*) {/,/}/d; /playImplementation/d' build.gradle
|
||||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
UpdateCheckMode: Tags ^[0-9.]+-fdroid$
|
||||
CurrentVersion: 2.14.1
|
||||
CurrentVersionCode: 32
|
||||
|
|
|
|||
|
|
@ -406,11 +406,10 @@ Builds:
|
|||
subdir: MeditationAssistant
|
||||
gradle:
|
||||
- opensource
|
||||
rm:
|
||||
- MeditationAssistantWear
|
||||
prebuild:
|
||||
- sed -i -e '/play-services/d' build.gradle
|
||||
- sed -i 's/4096m/1024m/' ../gradle.properties
|
||||
- sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
|
||||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
Loading…
Reference in a new issue