From 11a0bb188a9bedc520d7e45caefd399d5e5b2cfe Mon Sep 17 00:00:00 2001 From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com> Date: Fri, 28 Jul 2023 07:06:56 -0300 Subject: [PATCH] update dependencies --- .idea/kotlinc.xml | 2 +- app/build.gradle | 41 ++++++++++++++++++++++++++++------------- build.gradle | 2 +- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index e1eea1d6..217e5c51 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d8fc19ff..363eddc8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdk 26 targetSdk 33 versionCode 1 - versionName "1.0" + versionName "0.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -23,23 +23,37 @@ android { buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + // minifyEnabled false + // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + splits { + abi { + enable true + reset() + include "x86", "x86_64" + universalApk true + } + } + compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } + kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } + buildFeatures { compose true } + composeOptions { - kotlinCompilerExtensionVersion '1.3.2' + kotlinCompilerExtensionVersion = "1.5.1" } + packagingOptions { resources { excludes += '/META-INF/{AL2.0,LGPL2.1}' @@ -53,6 +67,8 @@ dependencies { implementation "androidx.compose.ui:ui:$compose_ui_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" + implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version" + // Navigation implementation("androidx.navigation:navigation-compose:$nav_version") @@ -62,16 +78,15 @@ dependencies { implementation "androidx.compose.material:material:$compose_ui_version" implementation "androidx.compose.material:material-icons-extended:$compose_ui_version" - implementation "androidx.compose.material:material-icons-extended:1.4.3" implementation 'androidx.appcompat:appcompat:1.6.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'io.mockk:mockk:1.13.5' + androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00') - androidTestImplementation 'androidx.compose.ui:ui-test-junit4' - debugImplementation 'androidx.compose.ui:ui-tooling' - debugImplementation 'androidx.compose.ui:ui-test-manifest' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" // Bitcoin secp256k1 bindings to Android implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.1' diff --git a/build.gradle b/build.gradle index da43c2b0..185ec8a9 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { plugins { id 'com.android.application' version '8.0.2' apply false id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'org.jetbrains.kotlin.android' version '1.9.0' apply false } task installGitHook(type: Copy) {