Skip to content

Commit 9561b31

Browse files
Merge branch 'main' into gh-page
2 parents 0aed4cc + 2b21f23 commit 9561b31

File tree

124 files changed

+5050
-4321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+5050
-4321
lines changed

CHANGELOG.md

Lines changed: 43 additions & 1 deletion

README.md

Lines changed: 5 additions & 5 deletions

README.pt-br.md

Lines changed: 1 addition & 1 deletion

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ kotlin {
117117
implementation(libs.kotest.runner.junit5)
118118
}
119119
}
120+
121+
androidTarget {
122+
dependencies {
123+
compileOnly(libs.androidx.compose.ui)
124+
}
125+
}
120126
}
121127
}
122128

@@ -226,12 +232,6 @@ val dokkaCopyToFolder by tasks.registering(Copy::class) {
226232
into(layout.projectDirectory.dir("docs/dokka"))
227233
}
228234

229-
tasks {
230-
dokkaGenerate {
231-
finalizedBy(dokkaCopyToFolder)
232-
}
233-
}
234-
235235
/* **************** */
236236
/* Publishing */
237237
/* **************** */

examples/android/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.compose.compiler)
45
}
56

67
android {
@@ -32,11 +33,15 @@ android {
3233
}
3334
buildFeatures {
3435
viewBinding = true
36+
compose = true
3537
}
3638
}
3739

3840
dependencies {
39-
implementation("io.github.g0dkar:qrcode-kotlin:4.3.0")
41+
val composeBom = platform("androidx.compose:compose-bom:2025.02.00")
42+
implementation(composeBom)
43+
44+
implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
4045
implementation(libs.core.ktx)
4146
implementation(libs.appcompat)
4247
implementation(libs.material)
@@ -46,4 +51,5 @@ dependencies {
4651
implementation("androidx.annotation:annotation:1.9.1")
4752
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
4853
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
54+
implementation("androidx.compose.foundation:foundation")
4955
}

examples/java/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ repositories {
88
}
99

1010
dependencies {
11-
implementation("io.github.g0dkar:qrcode-kotlin:4.3.0")
11+
implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
1212
implementation("org.jfree:org.jfree.svg:5.0.5")
1313
}
-54.6 KB
Binary file not shown.
-59.6 KB
Binary file not shown.

examples/java/example01-custom.png

-66.1 KB
Binary file not shown.
-54.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)