diff --git a/app/build.gradle b/app/build.gradle index e8f0e63..10a30e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ plugins { android { namespace 'fr.oupson.jxlviewer' - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "fr.oupson.jxlviewer" minSdk 21 - targetSdk 33 + targetSdk 34 versionCode 5 versionName "0.4.0" @@ -49,14 +49,14 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation project(path: ':libjxl') testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' implementation 'com.github.Baseflow:PhotoView:2.3.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' } \ No newline at end of file diff --git a/build.gradle b/build.gradle index d54c015..d5e3d53 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.1.0' apply false - id 'com.android.library' version '8.1.0' apply false - id 'org.jetbrains.kotlin.android' version '1.9.0' apply false - id 'androidx.benchmark' version '1.1.1' apply false + id 'com.android.application' version '8.2.0' apply false + id 'com.android.library' version '8.2.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.22' apply false + id 'androidx.benchmark' version '1.2.2' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cbb6ab9..a96e5af 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Oct 17 10:35:52 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/libjxl/build.gradle b/libjxl/build.gradle index fb2e144..cdd9683 100644 --- a/libjxl/build.gradle +++ b/libjxl/build.gradle @@ -5,11 +5,11 @@ plugins { android { namespace 'fr.oupson.libjxl' - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/libjxl_microbenchmark/build.gradle b/libjxl_microbenchmark/build.gradle index be67fd0..8a4287c 100644 --- a/libjxl_microbenchmark/build.gradle +++ b/libjxl_microbenchmark/build.gradle @@ -6,7 +6,7 @@ plugins { android { namespace 'fr.oupson.libjxl_microbenchmark' - compileSdk 33 + compileSdk 34 compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -19,7 +19,7 @@ android { defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 testInstrumentationRunnerArguments["androidx.benchmark.profiling.mode"] = 'StackSampling' @@ -44,7 +44,7 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.benchmark:benchmark-junit4:1.2.0-beta02' + androidTestImplementation 'androidx.benchmark:benchmark-junit4:1.2.2' androidTestImplementation project(':libjxl') } \ No newline at end of file