android grdle plugin 7.4.0

This commit is contained in:
tateisu 2023-01-27 00:54:04 +09:00
parent faa03b9368
commit c3a3234ea8
12 changed files with 32 additions and 25 deletions

View File

@ -10,6 +10,8 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
namespace 'jp.juggler.apng'
defaultConfig { defaultConfig {
targetSdkVersion target_sdk_version targetSdkVersion target_sdk_version
minSdkVersion min_sdk_version minSdkVersion min_sdk_version

View File

@ -1 +1 @@
<manifest package="jp.juggler.apng" /> <manifest />

View File

@ -93,20 +93,20 @@ android {
} }
packagingOptions { packagingOptions {
// https://github.com/Kotlin/kotlinx.coroutines/issues/1064
pickFirst("META-INF/atomicfu.kotlin_module")
resources { resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}' excludes += ['/META-INF/{AL2.0,LGPL2.1}', 'META-INF/DEPENDENCIES']
// https://github.com/Kotlin/kotlinx.coroutines/issues/1064
pickFirsts += ['META-INF/atomicfu.kotlin_module']
} }
exclude 'META-INF/DEPENDENCIES'
} }
useLibrary 'android.test.base' useLibrary 'android.test.base'
useLibrary 'android.test.mock' useLibrary 'android.test.mock'
lint {
lintOptions {
warning 'DuplicatePlatformClasses' warning 'DuplicatePlatformClasses'
} }
namespace 'jp.juggler.subwaytooter'
} }
static def gitBranch() { static def gitBranch() {

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="jp.juggler.subwaytooter">
<queries> <queries>
<!-- (自アプリ以外で)指定URLを開けるアプリの存在確認 --> <!-- (自アプリ以外で)指定URLを開けるアプリの存在確認 -->

View File

@ -39,7 +39,12 @@ android {
jvmTarget = "1.8" jvmTarget = "1.8"
} }
packagingOptions { packagingOptions {
exclude("META-INF/LICENSE*") jniLibs {
excludes += ['META-INF/LICENSE*']
}
resources {
excludes += ['META-INF/LICENSE*']
}
} }
} }
@ -92,7 +97,7 @@ dependencies {
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
api "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_coroutines_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_coroutines_version"
api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2" api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
api "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0" api "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0"
// Koin main features for Android // Koin main features for Android

View File

@ -39,10 +39,10 @@ buildscript {
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:7.3.1" classpath 'com.android.tools.build:gradle:7.4.0'
// room google-services // room google-services
classpath "com.google.gms:google-services:4.3.14" classpath "com.google.gms:google-services:4.3.15"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

View File

@ -19,9 +19,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
coreLibraryDesugaringEnabled true coreLibraryDesugaringEnabled true
} }
lintOptions {
abortOnError false
}
kotlinOptions { kotlinOptions {
jvmTarget = jvm_target jvmTarget = jvm_target
@ -33,6 +30,10 @@ android {
//"-opt-in=androidx.compose.animation.ExperimentalAnimationApi", //"-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
] ]
} }
lint {
abortOnError false
}
namespace 'com.jrummyapps.android.colorpicker'
} }
dependencies { dependencies {

View File

@ -1 +1 @@
<manifest package="com.jrummyapps.android.colorpicker"/> <manifest />

View File

@ -26,4 +26,5 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = jvm_target jvmTarget = jvm_target
} }
namespace 'jp.juggler.emoji'
} }

View File

@ -1,3 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android" />
package="jp.juggler.emoji"
/>

View File

@ -28,12 +28,13 @@ android {
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
} }
} }
packagingOptions { packagingOptions {
// https://github.com/Kotlin/kotlinx.coroutines/issues/1064 resources {
pickFirst("META-INF/atomicfu.kotlin_module") pickFirsts += ['META-INF/atomicfu.kotlin_module']
}
} }
kotlinOptions { kotlinOptions {
jvmTarget = jvm_target jvmTarget = jvm_target
freeCompilerArgs += [ freeCompilerArgs += [
@ -44,6 +45,7 @@ android {
// "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi", // "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
] ]
} }
namespace 'jp.juggler.apng.sample'
} }
dependencies { dependencies {

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="jp.juggler.apng.sample">
<uses-permission <uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:name="android.permission.WRITE_EXTERNAL_STORAGE"