Skip to content

Commit

Permalink
RMET-3387 :: merge development into main
Browse files Browse the repository at this point in the history
  • Loading branch information
OS-martacarlos authored Dec 6, 2024
2 parents 0d0cc4b + 9cda38e commit 1d98902
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

## [1.2.0]

### 03-12-2024
- Chore: Android - Bump Kotlin and Gradle versions (https://outsystemsrd.atlassian.net/browse/RMET-3887)

### 26-11-2024
- Feature: Android - Support Edge-to-Edge on all Android versions.

## [1.1.7]

### 11-11-2024
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.outsystems.plugins.barcode",
"version": "1.1.7",
"version": "1.2.0",
"description": "Cordova Bridge for the OutSystems Officially Supported Barcode Plugin.",
"keywords": [
"ecosystem:cordova",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<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">
<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">
<name>OSBarcode</name>
<description>Cordova Bridge for the OutSystems Officially Supported Barcode Plugin.</description>
<author>OutSystems Inc</author>
Expand Down
18 changes: 9 additions & 9 deletions src/android/com/outsystems/plugins/barcode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.1'
classpath 'com.android.tools.build:gradle:8.7.2'
}
}

Expand All @@ -26,20 +26,20 @@ repositories{
dependencies {
implementation("com.github.outsystems:oscore-android:1.2.0@aar")
implementation("com.github.outsystems:oscordova-android:2.0.1@aar")
implementation("com.github.outsystems:osbarcode-android:1.1.5@aar")
implementation("com.github.outsystems:osbarcode-android:1.2.0@aar")

implementation 'androidx.appcompat:appcompat:1.4.1'
implementation "androidx.activity:activity-ktx:1.4.0"
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation "androidx.activity:activity-ktx:1.9.3"

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'

implementation 'com.google.zxing:core:3.4.1'
implementation 'com.google.mlkit:barcode-scanning:17.3.0'
implementation "androidx.camera:camera-camera2:1.4.0"
implementation "androidx.camera:camera-lifecycle:1.4.0"
implementation "androidx.camera:camera-view:1.4.0"
implementation "androidx.activity:activity-compose:1.4.0"
implementation 'androidx.compose.material3:material3:1.0.0'
implementation 'androidx.compose.material3:material3-window-size-class:1.0.0'
implementation "androidx.activity:activity-compose:1.9.3"
implementation 'androidx.compose.material3:material3:1.3.1'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
}

0 comments on commit 1d98902

Please sign in to comment.