From a20c7cfa2fa2cc727ceff9b0293ce6cdbd7d9de0 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Tue, 10 Dec 2024 08:57:20 +0000 Subject: [PATCH] Revert "chore(android): bump kotlin, gradle and aar versions (#45)" This reverts commit ecef2dbcbd4eaaf3d8b62587ab518a48d151f085. --- example-app/android/build.gradle | 2 +- example-app/android/variables.gradle | 8 ++++---- plugin/android/build.gradle | 30 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/example-app/android/build.gradle b/example-app/android/build.gradle index 98dce3b..3f500b5 100644 --- a/example-app/android/build.gradle +++ b/example-app/android/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.7.2' + classpath 'com.android.tools.build:gradle:8.2.1' classpath 'com.google.gms:google-services:4.4.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/example-app/android/variables.gradle b/example-app/android/variables.gradle index 98898a0..00b1715 100644 --- a/example-app/android/variables.gradle +++ b/example-app/android/variables.gradle @@ -1,15 +1,15 @@ ext { minSdkVersion = 26 - compileSdkVersion = 35 - targetSdkVersion = 35 + compileSdkVersion = 34 + targetSdkVersion = 34 androidxActivityVersion = '1.8.0' - androidxAppCompatVersion = '1.7.0' + androidxAppCompatVersion = '1.6.1' androidxCoordinatorLayoutVersion = '1.2.0' androidxCoreVersion = '1.12.0' androidxFragmentVersion = '1.6.2' coreSplashScreenVersion = '1.0.1' androidxWebkitVersion = '1.9.0' - junitVersion = '4.13.3' + junitVersion = '4.13.2' androidxJunitVersion = '1.1.5' androidxEspressoCoreVersion = '3.5.1' cordovaAndroidVersion = '10.1.1' diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle index a3b1a56..309504f 100644 --- a/plugin/android/build.gradle +++ b/plugin/android/build.gradle @@ -6,7 +6,7 @@ ext { } buildscript { - ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.24' + ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.22' repositories { maven { url 'https://pkgs.dev.azure.com/OutSystemsRD/9e79bc5b-69b2-4476-9ca5-d67594972a52/_packaging/PublicArtifactRepository/maven/v1' @@ -26,7 +26,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:8.7.2' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -54,8 +54,8 @@ android { abortOnError false } compileOptions { - sourceCompatibility JavaVersion.VERSION_21 - targetCompatibility JavaVersion.VERSION_21 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } @@ -78,20 +78,20 @@ repositories { dependencies { // implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar']) //noinspection GradleDynamicVersion - implementation "com.github.outsystems:osbarcode-android:1.2.0@aar" + implementation "com.github.outsystems:osbarcode-android:1.+@aar" implementation project(':capacitor-android') implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" - implementation 'androidx.activity:activity-ktx:1.9.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' + implementation 'androidx.activity:activity-ktx:1.8.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' 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.9.3' - implementation 'androidx.compose.material3:material3:1.3.1' - implementation 'androidx.compose.material3:material3-window-size-class:1.3.1' + implementation 'com.google.mlkit:barcode-scanning:17.2.0' + implementation 'androidx.camera:camera-camera2:1.3.1' + implementation 'androidx.camera:camera-lifecycle:1.3.1' + implementation 'androidx.camera:camera-view:1.3.1' + implementation 'androidx.activity:activity-compose:1.8.2' + implementation 'androidx.compose.material3:material3:1.1.2' + implementation 'androidx.compose.material3:material3-window-size-class:1.1.2' testImplementation "junit:junit:$junitVersion" androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"