kopia lustrzana https://github.com/vitorpamplona/amethyst
Updates to Android Studio Iguana
rodzic
b6e096ec96
commit
3fb8a5938f
|
@ -145,14 +145,13 @@ android {
|
||||||
// Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
|
// Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
|
||||||
kotlinCompilerExtensionVersion "1.5.8"
|
kotlinCompilerExtensionVersion "1.5.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
resources {
|
resources {
|
||||||
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
excludes += ['/META-INF/{AL2.0,LGPL2.1}', '**/libscrypt.dylib']
|
||||||
}
|
}
|
||||||
exclude '**/libscrypt.dylib'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
lint {
|
lint {
|
||||||
disable 'MissingTranslation'
|
disable 'MissingTranslation'
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,8 +20,8 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '8.2.2' apply false
|
id 'com.android.application' version '8.3.0' apply false
|
||||||
id 'com.android.library' version '8.2.2' apply false
|
id 'com.android.library' version '8.3.0' apply false
|
||||||
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
|
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
|
||||||
id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false
|
id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false
|
||||||
id 'androidx.benchmark' version '1.2.3' apply false
|
id 'androidx.benchmark' version '1.2.3' apply false
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#Wed Jan 04 09:23:50 EST 2023
|
#Wed Jan 04 09:23:50 EST 2023
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|
|
@ -33,11 +33,12 @@ android {
|
||||||
jvmTarget = '17'
|
jvmTarget = '17'
|
||||||
freeCompilerArgs += "-Xstring-concat=inline"
|
freeCompilerArgs += "-Xstring-concat=inline"
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
// delete native scrypt lib because we cannot use dylibs in android
|
resources {
|
||||||
exclude '**/libscrypt.dylib'
|
excludes += ['**/libscrypt.dylib']
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
Ładowanie…
Reference in New Issue