From 1185bcef7975f0def94d6e593168c0b0c919bd8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:18:36 +0000 Subject: [PATCH 1/3] Update kotlin --- app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9571822..0c8ad36 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.7" + kotlinCompilerExtensionVersion = "1.5.15" } packaging { resources { diff --git a/build.gradle.kts b/build.gradle.kts index 4ce6056..973fa1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,5 +18,5 @@ plugins { id("com.android.application") version "8.2.2" apply false id("com.android.library") version "8.2.2" apply false - id("org.jetbrains.kotlin.android") version "1.8.21" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false } From 0b8c52e10de1a12f4b4a08b354150ceba6a24b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Mon, 9 Dec 2024 13:59:38 +0100 Subject: [PATCH 2/3] Create main.yml --- .github/workflows/main.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..9ad1ec5 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,28 @@ +name: Build + +on: + pull_request: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set Up JDK + uses: actions/setup-java@v4 + with: + distribution: 'zulu' # See 'Supported distributions' for available options + java-version: '17' + cache: 'gradle' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + + - name: Build project and run local and device tests + run: ./gradlew :app:assembleDebug From d3b29919d00de785cf4fa1e056e516b74fe6c8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Mon, 9 Dec 2024 16:54:48 +0000 Subject: [PATCH 3/3] Compose compiler plugin --- app/build.gradle.kts | 4 +--- build.gradle.kts | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0c8ad36..82066ce 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,6 +17,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") } android { @@ -55,9 +56,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 973fa1d..5cb2d25 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,4 +19,5 @@ plugins { id("com.android.application") version "8.2.2" apply false id("com.android.library") version "8.2.2" apply false id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false }