diff --git a/.github/workflows/build-desktop-jars.yml b/.github/workflows/build-release-binaries.yml similarity index 76% rename from .github/workflows/build-desktop-jars.yml rename to .github/workflows/build-release-binaries.yml index 0dfca24f..9ea0affa 100644 --- a/.github/workflows/build-desktop-jars.yml +++ b/.github/workflows/build-release-binaries.yml @@ -1,7 +1,7 @@ -name: Build Desktop Packages +name: Build Release Binaries on: - [workflow_dispatch] + [ workflow_dispatch ] jobs: create-linux-package: @@ -31,10 +31,10 @@ jobs: uses: ncipollo/release-action@v1 with: draft: true - tag: "v3.3.0" + allowUpdates: true + tag: "v3.3.1" artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*" token: ${{ secrets.GH_TOKEN }} - commit: main # Windows Package @@ -60,15 +60,30 @@ jobs: - name: Desktop App Package run: ./gradlew :desktop:packageMsi + # Build Android App + - name: Generate Release APK + run: ./gradlew :android:assembleRelease + + # Sign Android Apk + - name: Sign APK + uses: r0adkll/sign-android-release@v1 + id: sign_app + with: + releaseDirectory: android/build/outputs/apk/release + signingKeyBase64: ${{ secrets.SIGNING_KEY }} + alias: ${{ secrets.ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} + # Create a Draft Release - name: Draft Release uses: ncipollo/release-action@v1 with: draft: true - tag: "v3.3.0" - artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*" + allowUpdates: true + tag: "v3.3.1" + artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*,android/build/outputs/apk/release/*" token: ${{ secrets.GH_TOKEN }} - commit: main create-mac-package: @@ -98,7 +113,7 @@ jobs: uses: ncipollo/release-action@v1 with: draft: true - tag: "v3.3.0" + allowUpdates: true + tag: "v3.3.1" artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*" token: ${{ secrets.GH_TOKEN }} - commit: main diff --git a/buildSrc/src/main/kotlin/compiler-args.gradle.kts b/buildSrc/src/main/kotlin/compiler-args.gradle.kts index 229f26c0..39907c63 100644 --- a/buildSrc/src/main/kotlin/compiler-args.gradle.kts +++ b/buildSrc/src/main/kotlin/compiler-args.gradle.kts @@ -9,7 +9,6 @@ kotlin { useExperimentalAnnotation("kotlin.RequiresOptIn") useExperimentalAnnotation("kotlin.Experimental") useExperimentalAnnotation("kotlin.time.ExperimentalTime") - useExperimentalAnnotation("androidx.compose.animation") useExperimentalAnnotation("kotlinx.serialization.ExperimentalSerializationApi") } } diff --git a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts index c3ceac38..8b324515 100644 --- a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts @@ -27,6 +27,11 @@ kotlin { jvm("desktop") android() sourceSets { + all { + languageSettings.apply { + useExperimentalAnnotation("androidx.compose.animation") + } + } named("commonMain") { dependencies { // Decompose diff --git a/common/compose/build.gradle.kts b/common/compose/build.gradle.kts index 60543bc7..c47e194a 100644 --- a/common/compose/build.gradle.kts +++ b/common/compose/build.gradle.kts @@ -23,6 +23,11 @@ plugins { kotlin { sourceSets { + all { + languageSettings.apply { + useExperimentalAnnotation("androidx.compose.animation") + } + } commonMain { dependencies { implementation(compose.material)