diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 81ff9841..c4433859 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,6 +25,7 @@ jobs: assemble: name: Assemble runs-on: ubuntu-22.04 + if: startsWith(github.event.head_commit.message, 'build:') steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index 65a0f327..4071682c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ fastlane/report.xml fastlane/Preview.html fastlane/screenshots fastlane/test_output +push.sh diff --git a/app/phone/Ananas/release/output-metadata.json b/app/phone/Ananas/release/output-metadata.json index 96fd653e..8eeba120 100644 --- a/app/phone/Ananas/release/output-metadata.json +++ b/app/phone/Ananas/release/output-metadata.json @@ -16,9 +16,9 @@ } ], "attributes": [], - "versionCode": 14, - "versionName": "0.10.4-0.14.2", - "outputFile": "ananas-v0.10.4-0.14.2-Ananas-armeabi-v7a.apk" + "versionCode": 15, + "versionName": "0.10.5-0.14.2", + "outputFile": "ananas-v0.10.5-0.14.2-Ananas-armeabi-v7a.apk" }, { "type": "ONE_OF_MANY", @@ -29,22 +29,9 @@ } ], "attributes": [], - "versionCode": 14, - "versionName": "0.10.4-0.14.2", - "outputFile": "ananas-v0.10.4-0.14.2-Ananas-x86_64.apk" - }, - { - "type": "ONE_OF_MANY", - "filters": [ - { - "filterType": "ABI", - "value": "x86" - } - ], - "attributes": [], - "versionCode": 14, - "versionName": "0.10.4-0.14.2", - "outputFile": "ananas-v0.10.4-0.14.2-Ananas-x86.apk" + "versionCode": 15, + "versionName": "0.10.5-0.14.2", + "outputFile": "ananas-v0.10.5-0.14.2-Ananas-x86_64.apk" }, { "type": "ONE_OF_MANY", @@ -55,9 +42,22 @@ } ], "attributes": [], - "versionCode": 14, - "versionName": "0.10.4-0.14.2", - "outputFile": "ananas-v0.10.4-0.14.2-Ananas-arm64-v8a.apk" + "versionCode": 15, + "versionName": "0.10.5-0.14.2", + "outputFile": "ananas-v0.10.5-0.14.2-Ananas-arm64-v8a.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "x86" + } + ], + "attributes": [], + "versionCode": 15, + "versionName": "0.10.5-0.14.2", + "outputFile": "ananas-v0.10.5-0.14.2-Ananas-x86.apk" } ], "elementType": "File", @@ -66,20 +66,20 @@ "minApi": 28, "maxApi": 30, "baselineProfiles": [ - "baselineProfiles/1/ananas-v0.10.4-0.14.2-Ananas-armeabi-v7a.dm", - "baselineProfiles/1/ananas-v0.10.4-0.14.2-Ananas-x86_64.dm", - "baselineProfiles/1/ananas-v0.10.4-0.14.2-Ananas-x86.dm", - "baselineProfiles/1/ananas-v0.10.4-0.14.2-Ananas-arm64-v8a.dm" + "baselineProfiles/1/ananas-v0.10.5-0.14.2-Ananas-armeabi-v7a.dm", + "baselineProfiles/1/ananas-v0.10.5-0.14.2-Ananas-x86_64.dm", + "baselineProfiles/1/ananas-v0.10.5-0.14.2-Ananas-arm64-v8a.dm", + "baselineProfiles/1/ananas-v0.10.5-0.14.2-Ananas-x86.dm" ] }, { "minApi": 31, "maxApi": 2147483647, "baselineProfiles": [ - "baselineProfiles/0/ananas-v0.10.4-0.14.2-Ananas-armeabi-v7a.dm", - "baselineProfiles/0/ananas-v0.10.4-0.14.2-Ananas-x86_64.dm", - "baselineProfiles/0/ananas-v0.10.4-0.14.2-Ananas-x86.dm", - "baselineProfiles/0/ananas-v0.10.4-0.14.2-Ananas-arm64-v8a.dm" + "baselineProfiles/0/ananas-v0.10.5-0.14.2-Ananas-armeabi-v7a.dm", + "baselineProfiles/0/ananas-v0.10.5-0.14.2-Ananas-x86_64.dm", + "baselineProfiles/0/ananas-v0.10.5-0.14.2-Ananas-arm64-v8a.dm", + "baselineProfiles/0/ananas-v0.10.5-0.14.2-Ananas-x86.dm" ] } ], diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 4e837068..9f22b9c6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,8 +1,8 @@ import org.gradle.api.JavaVersion object Versions { - const val appCode = 14 - const val appName = "0.10.4-0.14.2" + const val appCode = 15 + const val appName = "0.10.5-0.14.2" const val compileSdk = 34 const val buildTools = "34.0.0"