Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- name: Generate Documentation
working-directory: android
run: ./gradlew :lib:dokkaHtml
run: ./gradlew :lib:dokkaGenerate

- name: Upload Documentation
uses: actions/upload-artifact@v4
Expand Down
8 changes: 2 additions & 6 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ plugins {

android {
namespace = "dev.keiji.j2k_wasm_sample"
compileSdk {
version = release(36) {
minorApiLevel = 1
}
}
compileSdk = 36

defaultConfig {
applicationId = "dev.keiji.j2k_wasm_sample"
Expand Down Expand Up @@ -59,4 +55,4 @@ dependencies {
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)
}
}
1 change: 1 addition & 0 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.dokka) apply false
}
4 changes: 3 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true

org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
8 changes: 2 additions & 6 deletions android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "9.1.0-alpha02"
agp = "8.13.2"
coreKtx = "1.17.0"
javascriptengine = "1.0.0"
junit = "4.13.2"
Expand All @@ -9,10 +9,8 @@ lifecycleRuntimeKtx = "2.10.0"
activityCompose = "1.12.2"
kotlin = "2.3.0"
composeBom = "2025.12.01"
appcompat = "1.7.1"
material = "1.13.0"
coroutines = "1.10.2"
dokka = "1.9.20"
dokka = "2.1.0"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand All @@ -30,8 +28,6 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }

Expand Down
12 changes: 7 additions & 5 deletions android/lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ plugins {

android {
namespace = "dev.keiji.jp2k"
compileSdk {
version = release(36) {
minorApiLevel = 1
}
}
compileSdk = 36

defaultConfig {
minSdk = 26
Expand All @@ -33,6 +29,12 @@ android {
}
}

dokka {
dokkaSourceSets.register("main") {
sourceRoots.from(file("src/main/java"))
}
}

dependencies {
implementation(libs.androidx.core.ktx)

Expand Down