commit
9a7728dddd
6 changed files with 11 additions and 19 deletions
2
.github/workflows/android.yml
vendored
2
.github/workflows/android.yml
vendored
|
@ -25,7 +25,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
java-version: 1.8
|
java-version: 1.8
|
||||||
- name: Unit tests
|
- name: Unit tests
|
||||||
run: bash ./gradlew -i -d test --stacktrace
|
run: bash ./gradlew test --stacktrace
|
||||||
|
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
@ -8,8 +8,8 @@ android {
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
// versionCode and versionName must be hardcoded to support F-droid
|
// versionCode and versionName must be hardcoded to support F-droid
|
||||||
versionCode 603001
|
versionCode 603011
|
||||||
versionName '6.3.0'
|
versionName '6.3.1'
|
||||||
applicationId buildVersion.applicationId
|
applicationId buildVersion.applicationId
|
||||||
minSdkVersion buildVersion.minAppSdk
|
minSdkVersion buildVersion.minAppSdk
|
||||||
targetSdkVersion buildVersion.targetSdk
|
targetSdkVersion buildVersion.targetSdk
|
||||||
|
@ -39,10 +39,6 @@ android {
|
||||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
kapt {
|
|
||||||
generateStubs true
|
|
||||||
}
|
|
||||||
|
|
||||||
testOptions {
|
testOptions {
|
||||||
unitTests {
|
unitTests {
|
||||||
includeAndroidResources true
|
includeAndroidResources true
|
||||||
|
|
|
@ -8,16 +8,12 @@ android {
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
// versionCode and versionName must be hardcoded to support F-droid
|
// versionCode and versionName must be hardcoded to support F-droid
|
||||||
versionCode 603001
|
versionCode 603011
|
||||||
versionName '6.3.0'
|
versionName '6.3.1'
|
||||||
minSdkVersion buildVersion.minAppSdk
|
minSdkVersion buildVersion.minAppSdk
|
||||||
targetSdkVersion buildVersion.targetSdk
|
targetSdkVersion buildVersion.targetSdk
|
||||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||||
}
|
}
|
||||||
|
|
||||||
kapt {
|
|
||||||
generateStubs true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ext.buildVersion = [
|
ext.buildVersion = [
|
||||||
versionCode : 603001, // MMmmPPv
|
versionCode : 603011, // MMmmPPv
|
||||||
versionName : '6.3.0',
|
versionName : '6.3.1',
|
||||||
targetSdk : 29,
|
targetSdk : 29,
|
||||||
minAppSdk : 16,
|
minAppSdk : 16,
|
||||||
wearMinAppSdk: 23,
|
wearMinAppSdk: 23,
|
||||||
|
|
|
@ -6,10 +6,10 @@ android {
|
||||||
compileSdkVersion buildVersion.targetSdk
|
compileSdkVersion buildVersion.targetSdk
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
versionCode 603011 // MMmmPPv
|
||||||
|
versionName '6.3.1'
|
||||||
minSdkVersion buildVersion.minAppSdk
|
minSdkVersion buildVersion.minAppSdk
|
||||||
targetSdkVersion buildVersion.targetSdk
|
targetSdkVersion buildVersion.targetSdk
|
||||||
versionCode buildVersion.versionCode
|
|
||||||
versionName buildVersion.versionName
|
|
||||||
resConfigs 'en', 'cs', 'de', 'es', 'fr', 'pt', 'ru', 'tr', 'vi', 'uk', 'zh'
|
resConfigs 'en', 'cs', 'de', 'es', 'fr', 'pt', 'ru', 'tr', 'vi', 'uk', 'zh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,8 @@ android {
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
// versionCode and versionName must be hardcoded to support F-droid
|
// versionCode and versionName must be hardcoded to support F-droid
|
||||||
versionCode 603001
|
versionCode 603011
|
||||||
versionName '6.3.0'
|
versionName '6.3.1'
|
||||||
applicationId buildVersion.applicationId
|
applicationId buildVersion.applicationId
|
||||||
minSdkVersion buildVersion.wearMinAppSdk
|
minSdkVersion buildVersion.wearMinAppSdk
|
||||||
targetSdkVersion buildVersion.targetSdk
|
targetSdkVersion buildVersion.targetSdk
|
||||||
|
|
Loading…
Reference in a new issue