diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 5bfd9f6..969e88e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -9,7 +9,6 @@ on: jobs: build: - runs-on: ubuntu-latest steps: @@ -36,7 +35,17 @@ jobs: run: ./gradlew build - name: Archive APK - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: app-release.apk - path: app/build/outputs/apk/release/app-release.apk \ No newline at end of file + path: app/build/outputs/apk/release/app-release.apk + - name: Archive app manifest + uses: actions/upload-artifact@v4 + with: + name: manifest.json + path: app/manifest.json + - name: Archive app icon + uses: actions/upload-artifact@v4 + with: + name: karoo-reminder.png + path: app/karoo-reminder.png \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..9d8661a --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,42 @@ +name: Release + +on: + push: + tags: + - 'v*.*.*' + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Download APK artifact + uses: actions/download-artifact@v4 + with: + name: app-release.apk + + - name: Download manifest artifact + uses: actions/download-artifact@v4 + with: + name: manifest.json + + - name: Download app icon artifact + uses: actions/download-artifact@v4 + with: + name: karoo-reminder.png + + - name: Create Release + id: create_release + uses: ncipollo/release-action@v1 + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + draft: true + prerelease: false + generateReleaseNotes: true + artifacts: app-release.apk, manifest.json, karoo-reminder.png + + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2df60ea..2d84b9f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,8 +15,8 @@ android { applicationId = "de.timklge.karooreminder" minSdk = 26 targetSdk = 34 - versionCode = 7 - versionName = "1.0.6" + versionCode = 8 + versionName = "1.0.7" } signingConfigs { diff --git a/app/manifest.json b/app/manifest.json index 6bab58d..198ac5a 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -3,9 +3,9 @@ "packageName": "de.timklge.karooreminder", "iconUrl": "https://github.com/timklge/karoo-reminder/releases/latest/download/karoo-reminder.png", "latestApkUrl": "https://github.com/timklge/karoo-reminder/releases/latest/download/app-release.apk", - "latestVersion": "1.0.6", - "latestVersionCode": 7, + "latestVersion": "1.0.7", + "latestVersionCode": 8, "developer": "timklge", "description": "Simple karoo extension that shows in-ride alerts every X minutes", - "releaseNotes": "Added display duration setting, bluetooth alert sound" + "releaseNotes": "Added display duration setting, bluetooth alert sound. Built via Github CD" } \ No newline at end of file diff --git a/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt b/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt index cef6791..7d6a94b 100644 --- a/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt +++ b/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt @@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch import kotlinx.serialization.json.Json -class KarooReminderExtension : KarooExtension("karoo-reminder", "1.0.6") { +class KarooReminderExtension : KarooExtension("karoo-reminder", "1.0.7") { companion object { const val TAG = "karoo-reminder"