RMET-3387 :: merge development into main

CHANGELOG.md

@@ -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]
+
+### 02-12-2024
+- Chore: Bump Kotlin and Gradle versions (https://outsystemsrd.atlassian.net/browse/RMET-3887).
+
+### 13-11-2024
+- Feature: Support Edge-to-Edge on all Android versions.
+
 ## [1.1.5]
 
 ### 08-11-2024

build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = "1.9.21"
+    ext.kotlin_version = "1.9.24"
     ext.jacocoVersion = '0.8.7'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jacoco:org.jacoco.core:$jacocoVersion"
     }
@@ -31,11 +31,11 @@ apply plugin: "jacoco"
 android {
 
     namespace "com.outsystems.plugins.barcode"
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdk 26
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -78,7 +78,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.7'
+        kotlinCompilerExtensionVersion '1.5.14'
     }
 
     packaging {
@@ -98,16 +98,16 @@ repositories {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation "androidx.compose.ui:ui:1.0.5"
-    implementation "androidx.compose.material:material:1.0.5"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.0.5"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.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.core:core-ktx:1.15.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation "androidx.compose.ui:ui:1.7.5"
+    implementation "androidx.compose.material:material:1.7.5"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.7.5"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
+    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'
     implementation 'androidx.window:window:1.3.0'
 
     testImplementation 'junit:junit:4.13.2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Apr 08 08:58:08 WEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

pom.xml

@@ -7,5 +7,5 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.outsystems</groupId>
     <artifactId>osbarcode-android</artifactId>
-    <version>1.1.5</version>
+    <version>1.2.0</version>
 </project>

src/main/kotlin/com/outsystems/plugins/barcode/view/OSBARCScannerActivity.kt

@@ -17,6 +17,7 @@ import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.camera.core.Camera
 import androidx.camera.core.CameraSelector
@@ -950,6 +951,7 @@ class OSBARCScannerActivity : ComponentActivity() {
                 systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             }
         }
+        enableEdgeToEdge()
     }
 
 }