Skip to content

Commit cd0a8d5

Browse files
matejsemancikmatejsemancik
authored
Merge branch 'develop' into feature/navigation-results
2 parents 9321b3a + 5674555 commit cd0a8d5

8 files changed

Lines changed: 72 additions & 163 deletions

File tree

‎.github/workflows/docs_deploy.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/on_cron.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Nightly build
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * 2-6" # https://crontab.guru/#0_0_*_*_2-6
6+
workflow_dispatch:
7+
inputs:
8+
version_name:
9+
description: 'Version name (Android)'
10+
required: true
11+
type: string
12+
default: '1.x.x-snapshot'
13+
14+
concurrency:
15+
group: ${{ github.workflow }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
generate_version:
20+
runs-on: ubuntu-latest
21+
outputs:
22+
version_name: ${{ steps.version.outputs.version_name }}
23+
steps:
24+
- name: Generate version name with timestamp
25+
id: version
26+
run: |
27+
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
28+
VERSION_NAME="${{ inputs.version_name }}"
29+
echo "[DEBUG] Using manual input version name: $VERSION_NAME"
30+
else
31+
VERSION_NAME="nightly-${{ github.run_id }}"
32+
echo "[DEBUG] Generated automatic version name: $VERSION_NAME"
33+
fi
34+
echo "version_name=$VERSION_NAME" >> $GITHUB_OUTPUT
35+
nightly_build:
36+
needs: generate_version
37+
uses: futuredapp/.github/.github/workflows/kmp-combined-nightly-build.yml@2.0.0
38+
with:
39+
# `testReleaseUnitTest` covers androidApp module and all shared modules all at once. No need to call `testEnterpriseUnitTest` and `testReleaseUnitTest`.
40+
ANDROID_TEST_GRADLE_TASK: testReleaseUnitTest
41+
ANDROID_PACKAGE_GRADLE_TASK: packageEnterpriseUniversalApk
42+
ANDROID_UPLOAD_GRADLE_TASK: appDistributionUploadEnterprise
43+
ANDROID_VERSION_NAME: ${{ needs.generate_version.outputs.version_name }}
44+
# TODO PROJECT-SETUP verify product flavor configuration
45+
# Specifies API environment for KMP build.
46+
# One of [dev|prod] as per configuration of Buildkonfig plugin in :shared:network:* Gradle module.
47+
KMP_FLAVOR: 'dev'
48+
KMP_SWIFT_PACKAGE_INTEGRATION: true
49+
KMP_SWIFT_PACKAGE_PATH: 'iosApp/shared/KMP'
50+
# TODO PROJECT-SETUP Verify app distribution groups
51+
FIREBASE_APP_DISTRIBUTION_GROUPS: futured-devs, futured-qa
52+
CHANGELOG_DEBUG: true
53+
CHANGELOG_CHECKOUT_DEPTH: 100
54+
CHANGELOG_FALLBACK_LOOKBACK: "2 weeks"
55+
secrets:
56+
FIREBASE_APP_DISTRIBUTION_SERVICE_ACCOUNT: ${{ secrets.APP_DISTRIBUTION_SERVICE_ACCOUNT }}
57+
# TODO PROJECT-SETUP create random secure string in repository secrets, or leave out to disable configuration cache
58+
GRADLE_CACHE_ENCRYPTION_KEY: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
59+
IOS_MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
60+
IOS_APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
61+
IOS_APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
62+
IOS_APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}

‎.github/workflows/on_demand_deploy.yml‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎.github/workflows/on_merge_pull_request.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.github/workflows/on_pull_request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ concurrency:
88

99
jobs:
1010
detect-changes:
11-
uses: futuredapp/.github/.github/workflows/kmp-cloud-detect-changes.yml@main
11+
uses: futuredapp/.github/.github/workflows/kmp-cloud-detect-changes.yml@2.0.0
1212

1313
check-android:
1414
needs: detect-changes
1515
if: ${{ needs.detect-changes.outputs.androidFiles == 'true' }}
16-
uses: futuredapp/.github/.github/workflows/android-cloud-check.yml@main
16+
uses: futuredapp/.github/.github/workflows/android-cloud-check.yml@2.0.0
1717
with:
1818
LINT_GRADLE_TASKS: lintCheck
1919
# `testReleaseUnitTest` covers androidApp module and all shared modules all at once. No need to call `testEnterpriseUnitTest` and `testReleaseUnitTest`.
@@ -22,7 +22,7 @@ jobs:
2222
check-ios:
2323
needs: detect-changes
2424
if: ${{ needs.detect-changes.outputs.iosFiles == 'true' }}
25-
uses: futuredapp/.github/.github/workflows/ios-kmp-selfhosted-test.yml@main
25+
uses: futuredapp/.github/.github/workflows/ios-kmp-selfhosted-test.yml@2.0.0
2626
with:
2727
kmp_swift_package_integration: true
2828
kmp_swift_package_path: iosApp/shared/KMP

‎.github/workflows/on_release.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
release_ios:
99
name: iOS Release
10-
uses: futuredapp/.github/.github/workflows/ios-kmp-selfhosted-release.yml@main
10+
uses: futuredapp/.github/.github/workflows/ios-kmp-selfhosted-release.yml@2.0.0
1111
with:
1212
kmp_swift_package_integration: true
1313
kmp_swift_package_path: iosApp/shared/KMP
@@ -23,11 +23,10 @@ jobs:
2323

2424
release_android:
2525
name: Android Release
26-
uses: futuredapp/.github/.github/workflows/android-cloud-release-googlePlay.yml@main
26+
uses: futuredapp/.github/.github/workflows/android-cloud-release-googlePlay.yml@2.0.0
2727
with:
2828
VERSION_NAME: ${{ github.event.release.tag_name }}
2929
BUNDLE_GRADLE_TASK: bundleRelease
30-
SIGNING_KEYSTORE_PATH: androidApp/keystore/release.keystore
3130
# TODO PROJECT-SETUP This has to be applicationId
3231
GOOGLE_PLAY_APPLICATION_ID: app.futured.kmptemplate.android
3332
GOOGLE_PLAY_WHATSNEW_DIRECTORY: androidApp/whatsnew

‎androidApp/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
applicationId = ProjectSettings.Android.ApplicationId
2525
minSdk = ProjectSettings.Android.MinSdkVersion
2626
targetSdk = ProjectSettings.Android.TargetSdkVersion
27-
versionCode = ProjectSettings.Android.VersionCode
28-
versionName = ProjectSettings.Android.VersionName
27+
versionCode = System.getenv("ANDROID_BUILD_NUMBER")?.toIntOrNull() ?: 1
28+
versionName = System.getenv("ANDROID_VERSION_NAME") ?: "1.x.x-local"
2929
}
3030

3131
buildFeatures {
@@ -48,9 +48,9 @@ android {
4848
}
4949
create(ProjectSettings.Android.BuildTypes.Release) {
5050
storeFile = file("keystore/todo_your_release_keystore.keystore")
51-
storePassword = ProjectSettings.Android.Signing.Release.StorePassword
52-
keyAlias = ProjectSettings.Android.Signing.Release.KeyAlias
53-
keyPassword = ProjectSettings.Android.Signing.Release.KeyPassword
51+
storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD").orEmpty()
52+
keyAlias = System.getenv("ANDROID_KEY_ALIAS").orEmpty()
53+
keyPassword = System.getenv("ANDROID_KEY_PASSWORD").orEmpty()
5454
}
5555
}
5656

‎buildSrc/src/main/kotlin/app/futured/kmptemplate/gradle/configuration/ProjectSettings.kt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ object ProjectSettings {
1919

2020
const val ApplicationId = "app.futured.kmptemplate.android"
2121

22-
val VersionCode = System.getenv("ANDROID_BUILD_NUMBER")?.toInt() ?: 1
23-
val VersionName = System.getenv("ANDROID_VERSION_NAME") ?: "1.0.0"
24-
2522
val JavaCompatibility = JavaVersion.VERSION_17
2623
const val KotlinJvmTargetNum = "17"
2724

@@ -37,12 +34,6 @@ object ProjectSettings {
3734
val KeyAlias = "androiddebugkey"
3835
val KeyPassword = "android"
3936
}
40-
41-
object Release {
42-
val StorePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD").orEmpty()
43-
val KeyAlias = System.getenv("ANDROID_KEY_ALIAS").orEmpty()
44-
val KeyPassword = System.getenv("ANDROID_KEY_PASSWORD").orEmpty()
45-
}
4637
}
4738
}
4839

0 commit comments

Comments
 (0)