diff --git a/apng_android/build.gradle b/apng_android/build.gradle
index 7345a4e3..75f677b0 100644
--- a/apng_android/build.gradle
+++ b/apng_android/build.gradle
@@ -10,6 +10,8 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
+ namespace 'jp.juggler.apng'
+
defaultConfig {
targetSdkVersion target_sdk_version
minSdkVersion min_sdk_version
diff --git a/apng_android/src/main/AndroidManifest.xml b/apng_android/src/main/AndroidManifest.xml
index a601bb9e..7d514097 100644
--- a/apng_android/src/main/AndroidManifest.xml
+++ b/apng_android/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index a4e91899..649c9adc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,20 +93,20 @@ android {
}
packagingOptions {
- // https://github.com/Kotlin/kotlinx.coroutines/issues/1064
- pickFirst("META-INF/atomicfu.kotlin_module")
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.mock'
-
- lintOptions {
+ lint {
warning 'DuplicatePlatformClasses'
}
+ namespace 'jp.juggler.subwaytooter'
+
}
static def gitBranch() {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ade52c6..b0c665e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
diff --git a/base/build.gradle b/base/build.gradle
index a2a3245f..90ec2bd1 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -39,7 +39,12 @@ android {
jvmTarget = "1.8"
}
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-core:$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"
// Koin main features for Android
diff --git a/build.gradle b/build.gradle
index 4d05a717..a7fb7bc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,10 +39,10 @@ buildscript {
}
dependencies {
- classpath "com.android.tools.build:gradle:7.3.1"
+ classpath 'com.android.tools.build:gradle:7.4.0'
// 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-serialization:$kotlin_version"
diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle
index c45f282b..2c081119 100644
--- a/colorpicker/build.gradle
+++ b/colorpicker/build.gradle
@@ -19,9 +19,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
coreLibraryDesugaringEnabled true
}
- lintOptions {
- abortOnError false
- }
kotlinOptions {
jvmTarget = jvm_target
@@ -33,6 +30,10 @@ android {
//"-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
]
}
+ lint {
+ abortOnError false
+ }
+ namespace 'com.jrummyapps.android.colorpicker'
}
dependencies {
diff --git a/colorpicker/src/main/AndroidManifest.xml b/colorpicker/src/main/AndroidManifest.xml
index 2d8ab765..cc947c56 100644
--- a/colorpicker/src/main/AndroidManifest.xml
+++ b/colorpicker/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/emoji/build.gradle b/emoji/build.gradle
index 637f4f99..5a6ba228 100644
--- a/emoji/build.gradle
+++ b/emoji/build.gradle
@@ -26,4 +26,5 @@ android {
kotlinOptions {
jvmTarget = jvm_target
}
+ namespace 'jp.juggler.emoji'
}
diff --git a/emoji/src/main/AndroidManifest.xml b/emoji/src/main/AndroidManifest.xml
index 214b890c..fb3a0f6f 100644
--- a/emoji/src/main/AndroidManifest.xml
+++ b/emoji/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-
+
diff --git a/sample_apng/build.gradle b/sample_apng/build.gradle
index 201d774c..e210057d 100644
--- a/sample_apng/build.gradle
+++ b/sample_apng/build.gradle
@@ -28,12 +28,13 @@ android {
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
-
packagingOptions {
- // https://github.com/Kotlin/kotlinx.coroutines/issues/1064
- pickFirst("META-INF/atomicfu.kotlin_module")
+ resources {
+ pickFirsts += ['META-INF/atomicfu.kotlin_module']
+ }
}
+
kotlinOptions {
jvmTarget = jvm_target
freeCompilerArgs += [
@@ -44,6 +45,7 @@ android {
// "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
]
}
+ namespace 'jp.juggler.apng.sample'
}
dependencies {
diff --git a/sample_apng/src/main/AndroidManifest.xml b/sample_apng/src/main/AndroidManifest.xml
index f3c8983f..61b531f1 100644
--- a/sample_apng/src/main/AndroidManifest.xml
+++ b/sample_apng/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">