Skip to content

Commit 25322db

Browse files
authored
Fix Android Example App (#900)
* Add Android Example App to CI * Fix up Android Same App buildfile
1 parent 7bde7d6 commit 25322db

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

.buildkite/pipeline.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,23 @@ steps:
204204
agents:
205205
queue: android
206206

207+
- label: ":android: Build Example App"
208+
plugins: [$CI_TOOLKIT]
209+
command: |
210+
echo "--- :rust: Installing Rust"
211+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v -y
212+
213+
source "$$HOME/.cargo/env"
214+
215+
echo "--- :package: Installing Rust Toolchains"
216+
make setup-rust
217+
make setup-rust-android-targets
218+
219+
echo "--- :android: Building Sample App"
220+
./native/kotlin/gradlew -p native/kotlin :example:composeApp:assembleDebug
221+
agents:
222+
queue: android
223+
207224
# Docker Group
208225
- group: ":wordpress: End-to-end Tests"
209226
key: "e2e"

native/kotlin/example/composeApp/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
22
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
35

46
plugins {
57
alias(libs.plugins.kotlinMultiplatform)
@@ -8,12 +10,10 @@ plugins {
810
alias(libs.plugins.compose.compiler)
911
}
1012

11-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12-
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
1313

1414
tasks.withType<KotlinJvmCompile>().configureEach {
1515
compilerOptions {
16-
jvmTarget.set(JvmTarget.JVM_11)
16+
jvmTarget.set(JvmTarget.JVM_21)
1717
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
1818
}
1919
}
@@ -91,8 +91,8 @@ android {
9191
}
9292
}
9393
compileOptions {
94-
sourceCompatibility = JavaVersion.VERSION_11
95-
targetCompatibility = JavaVersion.VERSION_11
94+
sourceCompatibility = JavaVersion.VERSION_21
95+
targetCompatibility = JavaVersion.VERSION_21
9696
}
9797
buildFeatures {
9898
compose = true

0 commit comments

Comments
 (0)