ビルド依存関係の記述をなるべくbaseモジュールにまとめる

This commit is contained in:
tateisu 2023-01-14 20:20:24 +09:00
parent a51b45d0cd
commit 4e17ba14fa
9 changed files with 194 additions and 259 deletions

View File

@ -1,14 +1,6 @@
apply plugin: 'java-library'
apply plugin: 'kotlin'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
//noinspection DifferentStdlibGradleVersion
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation "junit:junit:$junit_version"
}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@ -20,12 +12,14 @@ compileKotlin {
kotlinOptions {
jvmTarget = jvm_target
freeCompilerArgs += [
"-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
"-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
"-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
"-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
"-opt-in=kotlin.ExperimentalStdlibApi",
]
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
//noinspection DifferentStdlibGradleVersion
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation "junit:junit:$junit_version"
}

View File

@ -13,10 +13,6 @@ android {
defaultConfig {
targetSdkVersion target_sdk_version
minSdkVersion min_sdk_version
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
@ -45,13 +41,6 @@ repositories {
}
dependencies {
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test:runner:1.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
api project(':apng')
// 'api'
// 'implementation'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(":base")
}

View File

@ -126,164 +126,22 @@ kapt {
}
dependencies {
implementation(project(":base"))
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation fileTree(include: ['*.aar'], dir: 'src/main/libs')
// desugar_jdk_libs 2.0.0 AGP 7.4.0-alpha10
//noinspection GradleDependency
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_lib_bersion"
// targetSdkVersion 31 androidTest android:exported
// https://github.com/android/android-test/issues/1022
androidTestImplementation "androidx.test:core:$androidx_test_version"
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation(project(":base"))
implementation project(':colorpicker')
implementation project(':emoji')
implementation project(':apng_android')
implementation fileTree(include: ['*.aar'], dir: 'src/main/libs')
implementation "androidx.appcompat:appcompat:$appcompat_version"
// App1 使
api "org.conscrypt:conscrypt-android:2.5.2"
implementation "androidx.core:core-ktx:1.9.0"
def emoji2Version = "1.2.0"
implementation "androidx.emoji2:emoji2:$emoji2Version"
implementation "androidx.emoji2:emoji2-views:$emoji2Version"
implementation "androidx.emoji2:emoji2-views-helper:$emoji2Version"
implementation "androidx.emoji2:emoji2-bundled:$emoji2Version"
// DrawerLayout
implementation "androidx.drawerlayout:drawerlayout:1.1.1"
// NavigationView
implementation "com.google.android.material:material:1.7.0"
// CustomTabs
implementation "androidx.browser:browser:1.4.0"
// Recyclerview
implementation "androidx.recyclerview:recyclerview:1.2.1"
kapt 'androidx.annotation:annotation:1.5.0'
// https://firebase.google.com/support/release-notes/android
implementation "com.google.firebase:firebase-messaging:23.1.1"
implementation "org.jetbrains.kotlin:kotlin-reflect"
testImplementation "org.jetbrains.kotlin:kotlin-test"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
implementation "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0"
testImplementation "junit:junit:$junit_version" // kotlin-testとjunitを併用
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
testImplementation("com.squareup.okhttp3:mockwebserver:$okhttpVersion") {
exclude group: 'com.squareup.okio', module: 'okio'
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
}
androidTestImplementation("com.squareup.okhttp3:mockwebserver:$okhttpVersion") {
exclude group: 'com.squareup.okio', module: 'okio'
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
}
def glideVersion = '4.13.2'
implementation "com.github.bumptech.glide:glide:$glideVersion"
implementation "com.github.bumptech.glide:annotations:$glideVersion"
implementation("com.github.bumptech.glide:okhttp3-integration:$glideVersion") {
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
}
kapt "com.github.bumptech.glide:compiler:$glideVersion"
implementation "org.conscrypt:conscrypt-android:2.5.2"
implementation 'com.github.woxthebox:draglistview:1.6.6'
implementation 'com.github.omadahealth:swipy:1.2.3@aar'
implementation 'com.github.kenglxn.QRGen:android:2.5.0'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'
implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
/*
WARNING: [Processor] Library '…\exoplayer-ui-2.12.0.aar' contains references to both AndroidX and old support library. This seems like the library is partially migrated. Jetifier will try to rewrite the library anyway.
Example of androidX reference: 'androidx/core/app/NotificationCompat$Builder'
Example of support library reference: 'android/support/v4/media/session/MediaSessionCompat$Token'
expPlayerも苦労してるんだなあ
*/
implementation 'com.caverock:androidsvg-aar:1.4'
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
// ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
// LiveData
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
// Saved state module for ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
// if using Java8, use the following instead of lifecycle-compiler
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
// optional - helpers for implementing LifecycleOwner in a Service
implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
// optional - ProcessLifecycleOwner provides a lifecycle for the whole application process
implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
// optional - ReactiveStreams support for LiveData
implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"
// optional - Test helpers for LiveData
testImplementation "androidx.arch.core:core-testing:$arch_version"
implementation 'androidx.work:work-runtime-ktx:2.8.0-rc01'
def roomVersion = "2.5.0"
implementation "androidx.room:room-runtime:$roomVersion"
implementation "androidx.room:room-ktx:$roomVersion"
kapt "androidx.annotation:annotation:1.5.0"
kapt "androidx.room:room-compiler:$roomVersion"
def workVersion = "2.7.1"
implementation "androidx.work:work-runtime:$workVersion"
implementation "androidx.work:work-runtime-ktx:$workVersion"
implementation "androidx.startup:startup-runtime:$startup_version"
// Koin main features for Android
implementation "io.insert-koin:koin-android:$koin_version"
implementation "io.insert-koin:koin-android-compat:$koin_version"
implementation "io.insert-koin:koin-androidx-workmanager:$koin_version"
// implementation "io.insert-koin:koin-androidx-navigation:$koin_version"
// implementation "io.insert-koin:koin-androidx-compose:$koin_version"
// LiveEvent
implementation "com.github.hadilq:live-event:1.3.0"
kapt "com.github.bumptech.glide:compiler:$glideVersion"
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detekt_version")
}

View File

@ -41,67 +41,194 @@ android {
}
dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'com.google.android.material:material:1.7.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
// desugar_jdk_libs 2.0.0 AGP 7.4.0-alpha10
//noinspection GradleDependency
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_lib_bersion"
implementation "androidx.exifinterface:exifinterface:1.3.5"
api "androidx.appcompat:appcompat:$appcompat_version"
def emoji2Version = "1.2.0"
api "androidx.emoji2:emoji2:$emoji2Version"
api "androidx.emoji2:emoji2-views:$emoji2Version"
api "androidx.emoji2:emoji2-views-helper:$emoji2Version"
api "androidx.emoji2:emoji2-bundled:$emoji2Version"
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "androidx.core:core-ktx:1.9.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
implementation "org.jetbrains.kotlin:kotlin-reflect"
api 'androidx.core:core-ktx:1.9.0'
api 'com.google.android.material:material:1.7.0'
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
api "androidx.core:core-ktx:1.9.0"
// DrawerLayout
api "androidx.drawerlayout:drawerlayout:1.1.1"
// NavigationView
api "com.google.android.material:material:1.7.0"
// CustomTabs
api "androidx.browser:browser:1.4.0"
// Recyclerview
api "androidx.recyclerview:recyclerview:1.2.1"
api "androidx.exifinterface:exifinterface:1.3.5"
api "androidx.core:core-ktx:1.9.0"
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$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 "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
// ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
// LiveData
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
api "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
// Saved state module for ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
api "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
// if using Java8, use the following instead of lifecycle-compiler
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
// optional - helpers for implementing LifecycleOwner in a Service
implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
api "androidx.lifecycle:lifecycle-service:$lifecycle_version"
// optional - ProcessLifecycleOwner provides a lifecycle for the whole application process
implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
api "androidx.lifecycle:lifecycle-process:$lifecycle_version"
// optional - ReactiveStreams support for LiveData
implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"
api "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"
// optional - Test helpers for LiveData
testImplementation "androidx.arch.core:core-testing:$arch_version"
implementation "androidx.startup:startup-runtime:$startup_version"
api "androidx.startup:startup-runtime:$startup_version"
// video transcoder https://github.com/natario1/Transcoder
implementation "com.otaliastudios:transcoder:0.10.4"
api "com.otaliastudios:transcoder:0.10.4"
implementation 'io.github.inflationx:calligraphy3:3.1.1'
implementation 'io.github.inflationx:viewpump:2.0.3'
api 'io.github.inflationx:calligraphy3:3.1.1'
api 'io.github.inflationx:viewpump:2.0.3'
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
implementation "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0"
api "com.squareup.okhttp3:okhttp:$okhttpVersion"
api "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
api "ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0"
api 'com.github.woxthebox:draglistview:1.6.6'
api 'com.github.omadahealth:swipy:1.2.3@aar'
api 'com.github.kenglxn.QRGen:android:2.5.0'
api "com.google.android.flexbox:flexbox:3.0.0"
api 'com.astuetz:pagerslidingtabstrip:1.0.1'
api 'com.caverock:androidsvg-aar:1.4'
api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
// ViewModel
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
//noinspection KtxExtensionAvailable
//api "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
// LiveData
api "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
// Saved state module for ViewModel
api "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
// if using Java8, use the following instead of lifecycle-compiler
api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
// optional - helpers for implementing LifecycleOwner in a Service
api "androidx.lifecycle:lifecycle-service:$lifecycle_version"
// optional - ProcessLifecycleOwner provides a lifecycle for the whole application process
api "androidx.lifecycle:lifecycle-process:$lifecycle_version"
// optional - ReactiveStreams support for LiveData
api "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"
api 'androidx.work:work-runtime-ktx:2.8.0-rc01'
api "androidx.room:room-runtime:$roomVersion"
api "androidx.room:room-ktx:$roomVersion"
api 'com.google.android.exoplayer:exoplayer:2.18.2'
/*
WARNING: [Processor] Library '…\exoplayer-ui-2.12.0.aar' contains references to both AndroidX and old support library. This seems like the library is partially migrated. Jetifier will try to rewrite the library anyway.
Example of androidX reference: 'androidx/core/app/NotificationCompat$Builder'
Example of support library reference: 'android/support/v4/media/session/MediaSessionCompat$Token'
expPlayerも苦労してるんだなあ
*/
// LiveEvent
api "com.github.hadilq:live-event:1.3.0"
api "androidx.work:work-runtime:$workVersion"
api "androidx.work:work-runtime-ktx:$workVersion"
api "androidx.startup:startup-runtime:$startup_version"
// Koin main features for Android
api "io.insert-koin:koin-android:$koin_version"
api "io.insert-koin:koin-android-compat:$koin_version"
api "io.insert-koin:koin-androidx-workmanager:$koin_version"
// api "io.insert-koin:koin-androidx-navigation:$koin_version"
// api "io.insert-koin:koin-androidx-compose:$koin_version"
// https://firebase.google.com/support/release-notes/android
api "com.google.firebase:firebase-messaging:23.1.1"
api "com.github.bumptech.glide:glide:$glideVersion"
api "com.github.bumptech.glide:annotations:$glideVersion"
api("com.github.bumptech.glide:okhttp3-integration:$glideVersion") {
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
}
// kotlin-testとjunitを併用
testApi "junit:junit:$junit_version"
testApi "org.jetbrains.kotlin:kotlin-test"
// optional - Test helpers for LiveData
testApi "androidx.arch.core:core-testing:$arch_version"
// optional - Test helpers for LiveData
testApi "androidx.arch.core:core-testing:$arch_version"
testApi("com.squareup.okhttp3:mockwebserver:$okhttpVersion") {
exclude group: 'com.squareup.okio', module: 'okio'
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
}
androidTestApi 'androidx.test.ext:junit:1.1.5'
// targetSdkVersion 31 androidTest android:exported
// https://github.com/android/android-test/issues/1022
androidTestApi "androidx.test:core:$androidx_test_version"
androidTestApi 'androidx.test.espresso:espresso-core:3.5.1'
// androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
// exclude group: 'com.android.support', module: 'support-annotations'
// })
// androidTestApi('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
// exclude group: 'com.android.support', module: 'support-annotations'
// })
androidTestApi("com.squareup.okhttp3:mockwebserver:$okhttpVersion") {
exclude group: 'com.squareup.okio', module: 'okio'
exclude group: 'com.squareup.okhttp3', module: 'okhttp'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
}
}

View File

@ -11,6 +11,9 @@ buildscript {
ext.desugar_lib_bersion = "1.2.0"
ext.startup_version = "1.1.1"
ext.roomVersion = "2.5.0"
ext.workVersion = "2.7.1"
ext.glideVersion = '4.13.2'
ext.appcompat_version = "1.6.0"
ext.lifecycle_version = "2.5.1"

View File

@ -5,11 +5,6 @@ android {
compileSdkVersion compile_sdk_version
buildToolsVersion build_tools_version
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
targetSdkVersion target_sdk_version
minSdkVersion min_sdk_version
@ -17,12 +12,17 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
resourcePrefix "cpv_"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
coreLibraryDesugaringEnabled true
}
lintOptions {
abortOnError false
}
resourcePrefix "cpv_"
kotlinOptions {
jvmTarget = jvm_target
freeCompilerArgs += [
@ -36,15 +36,6 @@ android {
}
dependencies {
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation 'com.google.android.flexbox:flexbox:3.0.0'
testImplementation "junit:junit:$junit_version"
androidTestImplementation "androidx.test:core:$androidx_test_version"
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
exclude group: 'com.android.support', module: 'support-annotations'
})
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_lib_bersion"
implementation project(":base")
}

View File

@ -13,9 +13,6 @@ android {
defaultConfig {
targetSdkVersion target_sdk_version
minSdkVersion min_sdk_version
versionCode 1
versionName "1.0"
vectorDrawables.useSupportLibrary = true
}

View File

@ -5,12 +5,10 @@ plugins {
android {
namespace 'jp.juggler.icon_material_symbols'
compileSdk 32
compileSdk compile_sdk_version
defaultConfig {
minSdk 26
targetSdk 32
minSdk min_sdk_version
targetSdk target_sdk_version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
@ -29,13 +27,3 @@ android {
jvmTarget = '1.8'
}
}
dependencies {
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
}

View File

@ -47,19 +47,7 @@ android {
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':base')
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_lib_bersion"
implementation project(":base")
implementation project(':apng_android')
implementation "androidx.appcompat:appcompat:$appcompat_version"
//noinspection KtxExtensionAvailable
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test:runner:1.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
}