Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
g0dkar committed Nov 10, 2023
2 parents 6aa613b + a618a15 commit 7237397
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 38 deletions.
25 changes: 25 additions & 0 deletions .run/Build.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Build" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-x :test" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":clean" />
<option value=":build" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Publish Distribution" type="GradleRunConfiguration" factoryName="Gradle">
<configuration default="false" name="Publish Distribution - Sonar" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="scriptParameters" value="-x test" />
<option name="taskDescriptions">
<list />
</option>
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ that we can provide a better library/API for them. Please, feel free to share if
## Installation

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

**Gradle:**

```groovy
implementation("io.github.g0dkar:qrcode-kotlin:4.0.2")
implementation("io.github.g0dkar:qrcode-kotlin:4.0.5")
```

**Maven:**
Expand All @@ -55,20 +55,20 @@ implementation("io.github.g0dkar:qrcode-kotlin:4.0.2")
<dependency>
<groupId>io.github.g0dkar</groupId>
<artifactId>qrcode-kotlin-jvm</artifactId> <!-- or qrcode-kotlin-android -->
<version>4.0.2</version>
<version>4.0.5</version>
</dependency>
```

**NodeJS:**

```shell
npm install [email protected].2
npm install [email protected].5
```

**Browser:**

```html
<script src="https://cdn.jsdelivr.net/gh/g0dkar/qrcode-kotlin@main/release/qrcodeKotlin.min.js" type="application/javascript"></script>
<script src="https://cdn.jsdelivr.net/gh/g0dkar/qrcode-kotlin@main/release/qrcode-kotlin.min.js" type="application/javascript"></script>
```

## Usage
Expand Down Expand Up @@ -159,7 +159,7 @@ The main changes coming from `v3.3.0` are:
3. A bunch of optimizations on how the QRCode is drawn. Previously, we'd had a canvas for each square, which would then
be copied into the QRCode. This was changed to have just one large canvas where each square will be individually
drawn directly.
4. ![Experimental](https://img.shields.io/badge/Experimental-critical) iOS and tvOS Support: Starting from `v4.0.2` an
4. ![Experimental](https://img.shields.io/badge/Experimental-critical) iOS and tvOS Support: Starting from `v4.0.5` an
initial implementation of the `QRCodeGraphics` so that iOS and tvOS are now supported. **Any and
all [feedback](https://github.com/g0dkar/qrcode-kotlin/issues/85) are very welcome!**

Expand Down
12 changes: 6 additions & 6 deletions README.pt-br.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ Por favor, sinta-se livre para compartilhar se e como você utiliza este projeto
## Instalação

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

**Gradle:**

```groovy
implementation("io.github.g0dkar:qrcode-kotlin:4.0.2")
implementation("io.github.g0dkar:qrcode-kotlin:4.0.5")
```

**Maven:**
Expand All @@ -54,20 +54,20 @@ implementation("io.github.g0dkar:qrcode-kotlin:4.0.2")
<dependency>
<groupId>io.github.g0dkar</groupId>
<artifactId>qrcode-kotlin-jvm</artifactId> <!-- ou qrcode-kotlin-android -->
<version>4.0.2</version>
<version>4.0.5</version>
</dependency>
```

**NodeJS:**

```shell
npm install [email protected].2
npm install [email protected].5
```

**Browser:**

```html
<script src="https://cdn.jsdelivr.net/gh/g0dkar/qrcode-kotlin@main/release/qrcodeKotlin.min.js" type="application/javascript"></script>
<script src="https://cdn.jsdelivr.net/gh/g0dkar/qrcode-kotlin@main/release/qrcode-kotlin.min.js" type="application/javascript"></script>
```

## Uso
Expand Down Expand Up @@ -159,7 +159,7 @@ As principais mudanças vindo da versão `v3.3.0` são:
quadrado, o qual era copiado no canvas do QRCode principal. Isto foi mudado para termos apenas um grande canvas onde
cada quadrado individual será desenhado diretamente.
4. ![Experimental](https://img.shields.io/badge/Experimental-critical) Suporte a iOS e tvOS: A partir da
versão `v4.0.2`, uma implementação experimental inicial da classe `QRCodeGraphics` foi criada para que o iOS e tvOS
versão `v4.0.5`, uma implementação experimental inicial da classe `QRCodeGraphics` foi criada para que o iOS e tvOS
sejam suportados. **Todo e qualquer [feedback](https://github.com/g0dkar/qrcode-kotlin/issues/85) é muito bem-vindo!** (pode comentar em português mesmo)

## Licença
Expand Down
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ kotlin {
iosSimulatorArm64()
// watchosX64() <- Still have to figure out how to do it for watchOS x_x
// watchosArm64()
// watchosSimulatorArm64()
tvosX64()
tvosArm64()
tvosSimulatorArm64()
Expand Down Expand Up @@ -124,7 +123,7 @@ android {
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

defaultConfig {
minSdk = 24
minSdk = 23
}

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=4.0.4
version=4.0.5
kotlin.code.style=official

# JS
Expand Down
Binary file removed release/qrcode-kotlin-jvm-4.0.2.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions release/qrcodeKotlin.d.ts → release/qrcode-kotlin.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export declare namespace qrcode {
get rawData(): Array<Array<qrcode.internals.QRCodeSquare>>;
get computedSize(): number;
get graphics(): qrcode.render.QRCodeGraphics;
renderToGraphics(qrCodeGraphics?: qrcode.render.QRCodeGraphics, xOffset?: number, yOffset?: number): qrcode.render.QRCodeGraphics;
render(format?: string): Int8Array;
render(qrCodeGraphics?: qrcode.render.QRCodeGraphics, xOffset?: number, yOffset?: number): qrcode.render.QRCodeGraphics;
renderToBytes(format?: string): Int8Array;
reset(): void;
static get Companion(): {
get DEFAULT_SQUARE_SIZE(): number;
Expand Down
36 changes: 18 additions & 18 deletions release/qrcodeKotlin.js → release/qrcode-kotlin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion release/qrcodeKotlin.js.map

This file was deleted.

0 comments on commit 7237397

Please sign in to comment.