Skip to content

Commit 1d98902

Browse files
RMET-3387 :: merge development into main
2 parents 0d0cc4b + 9cda38e commit 1d98902

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
The changes documented here do not include those from the original repository.
88

9+
## [1.2.0]
10+
11+
### 03-12-2024
12+
- Chore: Android - Bump Kotlin and Gradle versions (https://outsystemsrd.atlassian.net/browse/RMET-3887)
13+
14+
### 26-11-2024
15+
- Feature: Android - Support Edge-to-Edge on all Android versions.
16+
917
## [1.1.7]
1018

1119
### 11-11-2024

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.outsystems.plugins.barcode",
3-
"version": "1.1.7",
3+
"version": "1.2.0",
44
"description": "Cordova Bridge for the OutSystems Officially Supported Barcode Plugin.",
55
"keywords": [
66
"ecosystem:cordova",

plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<plugin id="com.outsystems.plugins.barcode" version="1.1.7" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
2+
<plugin id="com.outsystems.plugins.barcode" version="1.2.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
33
<name>OSBarcode</name>
44
<description>Cordova Bridge for the OutSystems Officially Supported Barcode Plugin.</description>
55
<author>OutSystems Inc</author>

src/android/com/outsystems/plugins/barcode/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:8.1.1'
8+
classpath 'com.android.tools.build:gradle:8.7.2'
99
}
1010
}
1111

@@ -26,20 +26,20 @@ repositories{
2626
dependencies {
2727
implementation("com.github.outsystems:oscore-android:1.2.0@aar")
2828
implementation("com.github.outsystems:oscordova-android:2.0.1@aar")
29-
implementation("com.github.outsystems:osbarcode-android:1.1.5@aar")
29+
implementation("com.github.outsystems:osbarcode-android:1.2.0@aar")
3030

31-
implementation 'androidx.appcompat:appcompat:1.4.1'
32-
implementation "androidx.activity:activity-ktx:1.4.0"
31+
implementation 'androidx.appcompat:appcompat:1.7.0'
32+
implementation "androidx.activity:activity-ktx:1.9.3"
3333

34-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0'
35-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
34+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3'
35+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
3636

3737
implementation 'com.google.zxing:core:3.4.1'
3838
implementation 'com.google.mlkit:barcode-scanning:17.3.0'
3939
implementation "androidx.camera:camera-camera2:1.4.0"
4040
implementation "androidx.camera:camera-lifecycle:1.4.0"
4141
implementation "androidx.camera:camera-view:1.4.0"
42-
implementation "androidx.activity:activity-compose:1.4.0"
43-
implementation 'androidx.compose.material3:material3:1.0.0'
44-
implementation 'androidx.compose.material3:material3-window-size-class:1.0.0'
42+
implementation "androidx.activity:activity-compose:1.9.3"
43+
implementation 'androidx.compose.material3:material3:1.3.1'
44+
implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
4545
}

0 commit comments

Comments
 (0)