diff --git a/CHANGELOG.md b/CHANGELOG.md index 592030e..1bde07e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ The changes documented here do not include those from the original repository. ## Unreleased +### 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. diff --git a/build.gradle b/build.gradle index d826854..cd8f517 100644 --- a/build.gradle +++ b/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,15 +98,15 @@ 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.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.0.0' + implementation 'androidx.compose.material3:material3:1.3.1' implementation 'androidx.compose.material3:material3-window-size-class:1.0.0' implementation 'androidx.window:window:1.3.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df49134..c47e0e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 26e3b96..6ce3e96 100644 --- a/pom.xml +++ b/pom.xml @@ -7,5 +7,5 @@ 4.0.0 com.github.outsystems osbarcode-android - 1.2.0-dev1 + 1.2.0-dev3