From 38d08bc27868e28ba7868fe2e8c23d29e10fe4f6 Mon Sep 17 00:00:00 2001 From: Ben Martin Date: Mon, 20 Jan 2025 23:05:21 +0000 Subject: [PATCH 1/3] chore(deps): promote gradle and agp to latest --- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d9ed41f..5aea00d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.5.2" +agp = "8.8.0" android-compileSdk = "34" android-minSdk = "24" android-targetSdk = "34" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From db7e1b1057d7e98c4441554df40a9cdd4e838ed9 Mon Sep 17 00:00:00 2001 From: Ben Martin Date: Mon, 20 Jan 2025 23:58:18 +0000 Subject: [PATCH 2/3] feat: add CI build and release workflows This commit introduces two new GitHub Actions workflows: - `build.yaml`: Configures a workflow for building the project on pushes to the `master` branch and on pull requests. - `release.yaml`: Configures a workflow for releasing the project on tagged pushes, specifically for tags starting with 'v'. It builds the project, releases it using Gradle, and uploads the generated APK artifacts. --- .github/workflows/build.yaml | 24 ++++++++++++++++++++++++ .github/workflows/release.yaml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..7802aec --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,24 @@ +name: Build + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + + - name: Build with Gradle + run: ./gradlew composeApp:buildDebug diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..a324ded --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,32 @@ +name: Release + +on: + push: + tags: + - 'v*' + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + + - name: Build with Gradle + run: ./gradlew composeApp:buildDebug + + - name: Gradle Release + run: ./gradlew composeApp:debug + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: app + path: composeApp/build/outputs/apk/debug/*.apk From e43082df0ad013554e1d03e03b15fe1b6b92629f Mon Sep 17 00:00:00 2001 From: Ben Martin Date: Mon, 20 Jan 2025 23:58:18 +0000 Subject: [PATCH 3/3] feat: add CI build and release workflows This commit introduces two new GitHub Actions workflows: - `build.yaml`: Configures a workflow for building the project on pushes to the `master` branch and on pull requests. - `release.yaml`: Configures a workflow for releasing the project on tagged pushes, specifically for tags starting with 'v'. It builds the project, releases it using Gradle, and uploads the generated APK artifacts. --- .github/workflows/build.yaml | 24 ++++++++++++++++++++++++ .github/workflows/release.yaml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..7802aec --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,24 @@ +name: Build + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + + - name: Build with Gradle + run: ./gradlew composeApp:buildDebug diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..a324ded --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,32 @@ +name: Release + +on: + push: + tags: + - 'v*' + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + + - name: Build with Gradle + run: ./gradlew composeApp:buildDebug + + - name: Gradle Release + run: ./gradlew composeApp:debug + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: app + path: composeApp/build/outputs/apk/debug/*.apk