Skip to content

Commit ce23f98

Browse files
Merge branch 'main' into gh-page
2 parents 011c528 + 64469d2 commit ce23f98

39 files changed

+322
-143
lines changed

.github/workflows/dokka-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
repository: ${{ github.event.pull_request.head.repo.full_name }}
1515
ref: ${{ github.event.pull_request.head.ref }}
1616
- name: Set up JDK 17
17-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
17+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
1818
with:
1919
java-version: "17"
2020
distribution: "temurin"

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
repository: ${{ github.event.pull_request.head.repo.full_name }}
1717
ref: ${{ github.event.pull_request.head.ref }}
1818
- name: Set up JDK 17
19-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
19+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
2020
with:
2121
java-version: "17"
2222
distribution: "temurin"

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
> Mostly notable changes from version to version. Some stuff might go undocumented. If you find something that you think
77
> should be documented, please open an [issue](https://github.com/g0dkar/qrcode-kotlin/issues) :)
88
9-
# 4.4.1 - Latest
9+
# 4.5.0 - Latest
10+
11+
## ✨ New
12+
- Added (experimental) support for WASM targets (requested via Issues #140 and #167)
13+
- Please do let us know if you run into any issues with it <3
14+
15+
# 4.4.1
1016

1117
> I'm trying to keep a better CHANGELOG from now on ^^
1218

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ that we can provide a better library/API for them. Please, feel free to share if
3939
## 1. Installation
4040

4141
The library is available
42-
from [Maven Central](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/4.4.1/qrcode-kotlin)
42+
from [Maven Central](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/4.5.0/qrcode-kotlin)
4343
and [NPM JS](https://www.npmjs.com/package/qrcode-kotlin), so you can add it to your project as a dependency like any
4444
other:
4545

4646
**Gradle:**
4747

4848
```groovy
4949
// Use this for both Android and JVM
50-
implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
50+
implementation("io.github.g0dkar:qrcode-kotlin:4.5.0")
5151
```
5252

5353
**Maven - JVM:**
@@ -56,7 +56,7 @@ implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
5656
<dependency>
5757
<groupId>io.github.g0dkar</groupId>
5858
<artifactId>qrcode-kotlin-jvm</artifactId>
59-
<version>4.4.1</version>
59+
<version>4.5.0</version>
6060
</dependency>
6161
```
6262

@@ -66,14 +66,14 @@ implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
6666
<dependency>
6767
<groupId>io.github.g0dkar</groupId>
6868
<artifactId>qrcode-kotlin-android</artifactId>
69-
<version>4.4.1</version>
69+
<version>4.5.0</version>
7070
</dependency>
7171
```
7272

7373
**NodeJS:**
7474

7575
```shell
76-
npm install qrcode-kotlin@4.4.1
76+
npm install qrcode-kotlin@4.5.0
7777
```
7878

7979
**Browser:**

README.pt-br.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ Por favor, sinta-se livre para compartilhar se e como você utiliza este projeto
3939
## Instalação
4040

4141
A biblioteca está disponível através
42-
da [Maven Central](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/4.4.1/qrcode-kotlin) e
42+
da [Maven Central](https://search.maven.org/artifact/io.github.g0dkar/qrcode-kotlin/4.5.0/qrcode-kotlin) e
4343
do [NPM JS](https://www.npmjs.com/package/qrcode-kotlin), portanto basta adicioná-la a seu projeto como qualquer outra:
4444

4545
**Gradle:**
4646

4747
```groovy
4848
// Use esse tanto para Android quanto para a JVM
49-
implementation("io.github.g0dkar:qrcode-kotlin:4.2.1")
49+
implementation("io.github.g0dkar:qrcode-kotlin:4.5.0")
5050
```
5151

5252
**Maven - JVM:**
@@ -55,7 +55,7 @@ implementation("io.github.g0dkar:qrcode-kotlin:4.2.1")
5555
<dependency>
5656
<groupId>io.github.g0dkar</groupId>
5757
<artifactId>qrcode-kotlin-jvm</artifactId>
58-
<version>4.2.1</version>
58+
<version>4.5.0</version>
5959
</dependency>
6060
```
6161

@@ -65,14 +65,14 @@ implementation("io.github.g0dkar:qrcode-kotlin:4.2.1")
6565
<dependency>
6666
<groupId>io.github.g0dkar</groupId>
6767
<artifactId>qrcode-kotlin-android</artifactId>
68-
<version>4.2.1</version>
68+
<version>4.5.0</version>
6969
</dependency>
7070
```
7171

7272
**NodeJS:**
7373

7474
```shell
75-
npm install qrcode-kotlin@4.2.1
75+
npm install qrcode-kotlin@4.5.0
7676
```
7777

7878
**Browser:**

build.gradle.kts

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
13
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
24
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
35
import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
46
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
7+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
58
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode.PRODUCTION
69
import java.time.LocalDateTime
710

@@ -61,12 +64,22 @@ kotlin {
6164
}
6265

6366
js {
64-
compilations.all {
65-
kotlinOptions {
66-
main = "noCall"
67+
browser {
68+
commonWebpackConfig {
69+
mode = PRODUCTION
70+
sourceMaps = true
71+
}
72+
73+
testTask {
74+
enabled = false
6775
}
76+
77+
binaries.library()
78+
generateTypeScriptDefinitions()
6879
}
80+
}
6981

82+
wasmJs {
7083
browser {
7184
commonWebpackConfig {
7285
mode = PRODUCTION
@@ -123,6 +136,12 @@ kotlin {
123136
compileOnly(libs.androidx.compose.ui)
124137
}
125138
}
139+
140+
wasmJsMain {
141+
dependencies {
142+
implementation(libs.kotlinx.browser)
143+
}
144+
}
126145
}
127146
}
128147

examples/android/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ dependencies {
4141
val composeBom = platform("androidx.compose:compose-bom:2025.02.00")
4242
implementation(composeBom)
4343

44-
implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
44+
implementation("io.github.g0dkar:qrcode-kotlin:4.5.0")
4545
implementation(libs.core.ktx)
4646
implementation(libs.appcompat)
4747
implementation(libs.material)
4848
implementation(libs.constraintlayout)
4949
implementation(libs.navigation.fragment.ktx)
5050
implementation(libs.navigation.ui.ktx)
51-
implementation("androidx.annotation:annotation:1.9.1")
52-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
53-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
54-
implementation("androidx.compose.foundation:foundation")
51+
implementation(libs.androidx.annotation)
52+
implementation(libs.androidx.lifecycle.livedata.ktx)
53+
implementation(libs.androidx.lifecycle.viewmodel.ktx)
54+
implementation(libs.androidx.foundation)
5555
}

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.4.1")
11+
implementation("io.github.g0dkar:qrcode-kotlin:4.5.0")
1212
implementation("org.jfree:org.jfree.svg:5.0.5")
1313
}

examples/kotlin/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.4.1")
11+
implementation("io.github.g0dkar:qrcode-kotlin:4.5.0")
1212
implementation("org.jfree:org.jfree.svg:5.0.5")
1313
}

examples/spring-web/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
implementation("org.springframework.boot:spring-boot-starter-actuator")
3333

3434
// QRCode-Kotlin
35-
implementation("io.github.g0dkar:qrcode-kotlin:4.4.1")
35+
implementation("io.github.g0dkar:qrcode-kotlin:4.5.0")
3636

3737
// Tests
3838
// testImplementation("org.springframework.boot:spring-boot-starter-test")

0 commit comments

Comments
 (0)