RMET-3887 :: 1.2.0 ::merge development into main

.github/workflows/github_actions.yml

@@ -1,4 +1,4 @@
-name: GitHub Actions
+name: Unit Tests
 
 on:
   workflow_dispatch:

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.2.0
+
+- Bump Kotlin and Gradle versions (https://outsystemsrd.atlassian.net/browse/RMET-3887)
+
 ## 1.1.0
 
 ### Features

azure-pipelines.yml

@@ -22,7 +22,7 @@ steps:
     organization: 'outsystemsrd'
     scannerMode: 'CLI'
     configMode: 'file'
-- task: Gradle@2
+- task: Gradle@3
   displayName: Build Project
   inputs:
     workingDirectory: ''

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.9.21"
+    ext.kotlin_version = "1.9.24"
     ext.jacocoVersion = '0.8.7'
     repositories {
         google()
@@ -12,7 +12,7 @@ buildscript {
         if (System.getenv("SHOULD_PUBLISH") == "true") {
             classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
         }
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jacoco:org.jacoco.core:$jacocoVersion"
     }
@@ -41,11 +41,11 @@ apply plugin: "jacoco"
 
 android {
     namespace "com.outsystems.plugins.inappbrowser.osinappbrowserlib"
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdk 26
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -82,7 +82,7 @@ android {
 
         def fileFilter = ['**/BuildConfig.*', '**/Manifest*.*']
         def debugTree = fileTree(dir: "${buildDir}/tmp/kotlin-classes/debug", excludes: fileFilter)
-        def mainSrc = "${project.projectDir}/src/main/kotlin"
+        def mainSrc = "${project.projectDir}/src/main/java"
 
         sourceDirectories.setFrom(files([mainSrc]))
         classDirectories.setFrom(files([debugTree]))
@@ -117,12 +117,12 @@ repositories {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.browser:browser:1.8.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.3'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.webkit:webkit:1.11.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.webkit:webkit:1.12.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.activity:activity-ktx:1.9.3'
 
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'

gradle.properties

@@ -13,3 +13,4 @@
 #Fri Apr 08 09:41:39 WEST 2022
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed May 29 18:08:54 CDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pom.xml

@@ -6,5 +6,5 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.outsystems</groupId>
     <artifactId>osinappbrowser-android</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </project>