remove warnings
This commit is contained in:
parent
0685915eea
commit
31549e440d
|
@ -3,7 +3,6 @@
|
|||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="1.8">
|
||||
<module name="apng" target="1.7" />
|
||||
<module name="SubwayTooter" target="17" />
|
||||
<module name="SubwayTooter.anko" target="17" />
|
||||
<module name="SubwayTooter.apng_android" target="17" />
|
||||
<module name="SubwayTooter.app" target="17" />
|
||||
|
|
|
@ -13,7 +13,6 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
minSdk = Vers.stMinSdkVersion
|
||||
targetSdk = Vers.stTargetSdkVersion
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles("consumer-rules.pro")
|
||||
|
|
|
@ -12,7 +12,6 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
minSdk = Vers.stMinSdkVersion
|
||||
targetSdk = Vers.stTargetSdkVersion
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
|
|
|
@ -25,8 +25,8 @@ android {
|
|||
defaultConfig {
|
||||
targetSdk = Vers.stTargetSdkVersion
|
||||
minSdk = Vers.stMinSdkVersion
|
||||
versionCode = 539
|
||||
versionName = "5.539"
|
||||
versionCode = 540
|
||||
versionName = "5.540"
|
||||
applicationId = "jp.juggler.subwaytooter"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
|
|
@ -12,9 +12,8 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
minSdk = Vers.stMinSdkVersion
|
||||
targetSdk = Vers.stTargetSdkVersion
|
||||
|
||||
consumerProguardFiles( "consumer-rules.pro")
|
||||
consumerProguardFiles("consumer-rules.pro")
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
@ -45,18 +44,18 @@ android {
|
|||
jvmTarget = Vers.kotlinJvmTarget
|
||||
}
|
||||
}
|
||||
packagingOptions {
|
||||
packaging {
|
||||
jniLibs {
|
||||
excludes .addAll(listOf("META-INF/LICENSE*"))
|
||||
excludes.addAll(listOf("META-INF/LICENSE*"))
|
||||
}
|
||||
resources {
|
||||
excludes .addAll(listOf("META-INF/LICENSE*"))
|
||||
excludes.addAll(listOf("META-INF/LICENSE*"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain( Vers.kotlinJvmToolchain)
|
||||
jvmToolchain(Vers.kotlinJvmToolchain)
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile>().configureEach {
|
||||
|
@ -71,7 +70,7 @@ dependencies {
|
|||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:${Vers.desugarLibVersion}")
|
||||
|
||||
api("androidx.appcompat:appcompat:${Vers.appcompatVersion}")
|
||||
api("androidx.browser:browser:1.5.0")
|
||||
api("androidx.browser:browser:1.6.0")
|
||||
api("androidx.core:core-ktx:${Vers.coreKtxVersion}")
|
||||
api("androidx.drawerlayout:drawerlayout:1.2.0")
|
||||
api("androidx.emoji2:emoji2-bundled:${Vers.emoji2Version}")
|
||||
|
@ -87,7 +86,7 @@ dependencies {
|
|||
api("androidx.lifecycle:lifecycle-service:${Vers.lifecycleVersion}")
|
||||
api("androidx.lifecycle:lifecycle-viewmodel-ktx:${Vers.lifecycleVersion}")
|
||||
api("androidx.lifecycle:lifecycle-viewmodel-savedstate:${Vers.lifecycleVersion}")
|
||||
api("androidx.recyclerview:recyclerview:1.3.0")
|
||||
api("androidx.recyclerview:recyclerview:1.3.1")
|
||||
api("androidx.startup:startup-runtime:${Vers.startupVersion}")
|
||||
api("androidx.work:work-runtime-ktx:${Vers.workVersion}")
|
||||
api("androidx.work:work-runtime:${Vers.workVersion}")
|
||||
|
|
|
@ -22,9 +22,9 @@ buildscript {
|
|||
}
|
||||
|
||||
plugins {
|
||||
id("org.jetbrains.kotlin.jvm") version "${Vers.kotlinVersion}"
|
||||
id("org.jetbrains.kotlin.android") version ("${Vers.kotlinVersion}") apply false
|
||||
id("com.google.devtools.ksp") version ("${Vers.kspVersion}") apply false
|
||||
id("org.jetbrains.kotlin.jvm") version (Vers.kotlinVersion) apply false
|
||||
id("org.jetbrains.kotlin.android") version (Vers.kotlinVersion) apply false
|
||||
id("com.google.devtools.ksp") version (Vers.kspVersion) apply false
|
||||
}
|
||||
|
||||
allprojects {
|
||||
|
|
|
@ -15,10 +15,10 @@ object Vers {
|
|||
const val commonsCodecVersion = "1.16.0"
|
||||
const val composeVersion = "1.0.5"
|
||||
const val conscryptVersion = "2.5.2"
|
||||
const val coreKtxVersion = "1.10.1"
|
||||
const val coreKtxVersion = "1.12.0"
|
||||
const val desugarLibVersion = "2.0.3"
|
||||
const val detektVersion = "1.23.1"
|
||||
const val emoji2Version = "1.3.0"
|
||||
const val emoji2Version = "1.4.0"
|
||||
const val glideVersion = "4.15.1"
|
||||
const val junitVersion = "4.13.2"
|
||||
const val koinVersion = "3.4.2"
|
||||
|
@ -30,9 +30,9 @@ object Vers {
|
|||
const val kspVersion = "1.9.0-1.0.11"
|
||||
const val lifecycleVersion = "2.6.1"
|
||||
const val materialVersion = "1.9.0"
|
||||
const val media3Version = "1.1.0"
|
||||
const val media3Version = "1.1.1"
|
||||
const val okhttpVersion = "5.0.0-alpha.11"
|
||||
const val preferenceKtxVersion = "1.2.0"
|
||||
const val preferenceKtxVersion = "1.2.1"
|
||||
const val stBuildToolsVersion = "34.0.0"
|
||||
const val stCompileSdkVersion = 34
|
||||
const val stMinSdkVersion = 26
|
||||
|
|
Loading…
Reference in New Issue