diff --git a/ammolite/build.gradle b/ammolite/build.gradle index b81832b59..2d06634ce 100644 --- a/ammolite/build.gradle +++ b/ammolite/build.gradle @@ -9,6 +9,7 @@ android { defaultConfig { minSdk 26 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -16,16 +17,26 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + create("benchmark") { + initWith(getByName("release")) + signingConfig signingConfigs.debug + } } 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' + freeCompilerArgs += "-Xstring-concat=inline" + } + packagingOptions { + resources { + excludes += ['**/libscrypt.dylib'] + } } } diff --git a/benchmark/build.gradle b/benchmark/build.gradle index cf523ff76..b2f754cb2 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -55,6 +55,7 @@ dependencies { androidTestImplementation libs.androidx.benchmark.junit4 androidTestImplementation project(path: ':quartz') androidTestImplementation project(path: ':commons') + androidTestImplementation project(path: ':ammolite') androidTestImplementation libs.androidx.compose.foundation