Skip to content

Commit a4b6cbb

Browse files
Merge branch 'refs/heads/main' into gh-page
2 parents 088f33d + b23f19f commit a4b6cbb

Some content is hidden

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

49 files changed

+646
-2760
lines changed

.github/workflows/dokka-update.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
12+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1313
with:
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@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
17+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
1818
with:
1919
java-version: "17"
2020
distribution: "temurin"
2121
- name: Run Dokka Update
22-
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2
22+
uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3
2323
with:
2424
arguments: :dokkaGfm
2525
- name: Commit Changes
26-
uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # v9
26+
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9
2727
with:
2828
message: "[CI] Dokka Update"
2929
committer_name: "GitHub Actions"

.github/workflows/run-tests.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
14+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1515
with:
1616
repository: ${{ github.event.pull_request.head.repo.full_name }}
1717
ref: ${{ github.event.pull_request.head.ref }}
18-
- name: Set up JDK 8
19-
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
2020
with:
21-
java-version: "8.0"
21+
java-version: "17"
2222
distribution: "temurin"
23+
cache: gradle
24+
- name: Give execute permission to ./gradlew
25+
run: chmod +x ./gradlew
26+
- name: Build and Publish Locally
27+
run: "./gradlew clean :build :publishToMavenLocal -x :test -x :jvmTest -Pkotlin.incremental.useClasspathSnapshot=false"
2328
- name: Run Tests
24-
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2
25-
with:
26-
arguments: :test
29+
run: "./gradlew test -Pkotlin.incremental.useClasspathSnapshot=false"

.run/Run Tests.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
</option>
1111
<option name="taskNames">
1212
<list>
13-
<option value="clean" />
14-
<option value="check" />
13+
<option value=":jvmTest" />
1514
</list>
1615
</option>
1716
<option name="vmOptions" />
1817
</ExternalSystemSettings>
1918
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2019
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2120
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
2222
<method v="2" />
2323
</configuration>
2424
</component>

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
[![License](https://img.shields.io/github/license/g0dkar/qrcode-kotlin)](LICENSE)
22
[![Maven Central](https://img.shields.io/maven-central/v/io.github.g0dkar/qrcode-kotlin.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.github.g0dkar%22%20AND%20a:%22qrcode-kotlin%22)
3-
[![ktlint](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/)
43

54
# Change Log
65

76
> Mostly notable changes from version to version. Some stuff might go undocumented. If you find something that you think
87
> should be documented, please open an [issue](https://github.com/g0dkar/qrcode-kotlin/issues) :)
98
10-
## 4.1.0 - Latest
9+
## 4.2.0 - Latest
10+
11+
- Fixed issue with the Error Correction being ignored (thanks [slaha](https://github.com/slaha)!)
12+
- Updated libs versions
13+
- **Only for project devs:** fixed the pipeline issues with running tests for PRs.
14+
- **Investigating:** Issues with very large payloads being encoded
15+
16+
## 4.1.0
1117

1218
- Another round of improvements and fixes (special thanks to [ruicanas](https://github.com/ruicanas) and [chphmh](https://github.com/chphmh)!)
1319
- Changed the minimal requirements for the library:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ other:
4747

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

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

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

7373
**NodeJS:**
7474

7575
```shell
76-
npm install qrcode-kotlin@4.1.1
76+
npm install qrcode-kotlin@4.2.0
7777
```
7878

7979
**Browser:**

README.pt-br.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ do [NPM JS](https://www.npmjs.com/package/qrcode-kotlin), portanto basta adicion
4646

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

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

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

7272
**NodeJS:**
7373

7474
```shell
75-
npm install qrcode-kotlin@4.1.1
75+
npm install qrcode-kotlin@4.2.0
7676
```
7777

7878
**Browser:**

0 commit comments

Comments
 (0)