From cf15246f4a2a6c60bec12e5c2986cf4d1126a661 Mon Sep 17 00:00:00 2001 From: wada811 Date: Wed, 3 Apr 2019 11:44:19 +0900 Subject: [PATCH] Configure buildSrc --- app/build.gradle | 5 +++-- buildSrc/build.gradle.kts | 7 +++++++ buildSrc/src/main/java/Dependencies.kt | 20 ++++++++++++++++++++ core-binding/build.gradle | 4 ++-- core-domain/build.gradle | 4 ++-- core-infra/build.gradle | 7 ++++--- core-service/build.gradle | 5 +++-- feature-StoryCore/build.gradle | 15 ++++++++------- feature-StoryDetail/build.gradle | 17 +++++++++-------- feature-StoryList/build.gradle | 19 ++++++++++--------- library-ThreeTenBP/build.gradle | 2 +- settings.gradle | 20 ++++++++++---------- 12 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/java/Dependencies.kt diff --git a/app/build.gradle b/app/build.gradle index 7d16ca0..0ebe7b9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,9 @@ android { } dependencies { - implementation project(":library-Timber") - implementation project(":library-ThreeTenABP") + implementation Deps.timber + implementation Deps.threeTenABP + implementation Deps.threeTenBP implementation project(":core-domain") implementation project(":core-infra") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..d796eb2 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} +// Required since Gradle 4.10+. +repositories { + jcenter() +} diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt new file mode 100644 index 0000000..a6394d3 --- /dev/null +++ b/buildSrc/src/main/java/Dependencies.kt @@ -0,0 +1,20 @@ +object Deps { + object Versions { + + } + + val androidxActivity = "androidx.activity:activity:1.0.0-alpha05" + val androidxAppCompat = "androidx.appcompat:appcompat:1.1.0-alpha03" + val androidxConstraintLayout = "androidx.constraintlayout:constraintlayout:1.1.3" + val androidxRecyclerView = "androidx.recyclerview:recyclerview:1.1.0-alpha03" + + val lifecycleDisposable = "com.github.wada811.LifecycleDisposable:lifecycledisposable:1.0.0" + val rxAndroid = "io.reactivex.rxjava2:rxandroid:2.1.1" + val rxKotlin = "io.reactivex.rxjava2:rxkotlin:2.3.0" + val rxJava = "io.reactivex.rxjava2:rxjava:2.2.6" + + val threeTenABP = "com.jakewharton.threetenabp:threetenabp:1.2.0" + val threeTenBP = "org.threeten:threetenbp:1.3.8:no-tzdb" + + val timber = "com.jakewharton.timber:timber:4.7.1" +} diff --git a/core-binding/build.gradle b/core-binding/build.gradle index 21b4322..5ef8be6 100644 --- a/core-binding/build.gradle +++ b/core-binding/build.gradle @@ -3,6 +3,6 @@ apply from: "$rootDir/android-library.gradle" apply from: "$rootDir/android-databinding.gradle" dependencies { - implementation project(":library-AndroidX-AppCompat") - implementation project(":library-Timber") + implementation Deps.androidxAppCompat + implementation Deps.timber } diff --git a/core-domain/build.gradle b/core-domain/build.gradle index 459befd..ff4ad8d 100644 --- a/core-domain/build.gradle +++ b/core-domain/build.gradle @@ -2,6 +2,6 @@ apply plugin: 'com.android.library' apply from: "$rootDir/android-library.gradle" dependencies { - implementation project(":library-Timber") - implementation project(":library-ThreeTenBP") + implementation Deps.timber + implementation Deps.threeTenBP } diff --git a/core-infra/build.gradle b/core-infra/build.gradle index 591a264..ba94ed4 100644 --- a/core-infra/build.gradle +++ b/core-infra/build.gradle @@ -5,9 +5,10 @@ apply plugin: 'kotlin-kapt' dependencies { implementation project(":core-domain") - implementation project(":library-Timber") - implementation project(":library-ThreeTenBP") - implementation project(":library-RxJava") + implementation Deps.timber + implementation Deps.threeTenBP + implementation Deps.rxKotlin + implementation Deps.rxJava implementation 'com.squareup.okhttp3:okhttp:3.14.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0' diff --git a/core-service/build.gradle b/core-service/build.gradle index 4b1e60f..d9df7ed 100644 --- a/core-service/build.gradle +++ b/core-service/build.gradle @@ -2,8 +2,9 @@ apply plugin: 'com.android.library' apply from: "$rootDir/android-library.gradle" dependencies { - implementation project(":library-Timber") - implementation project(":library-RxJava") + implementation Deps.timber + implementation Deps.rxKotlin + implementation Deps.rxJava implementation project(":core-domain") implementation project(":core-infra") diff --git a/feature-StoryCore/build.gradle b/feature-StoryCore/build.gradle index f1f9dc6..4566bd0 100644 --- a/feature-StoryCore/build.gradle +++ b/feature-StoryCore/build.gradle @@ -9,15 +9,16 @@ android { } dependencies { - implementation project(":library-AndroidX-Activity") - implementation project(":library-AndroidX-AppCompat") - implementation project(":library-AndroidX-ConstraintLayout") - implementation project(":library-AndroidX-RecyclerView") + implementation Deps.androidxActivity + implementation Deps.androidxAppCompat +implementation Deps.androidxConstraintLayout + implementation Deps.androidxRecyclerView - implementation project(":library-Timber") + implementation Deps.timber // Rx - implementation project(":library-RxAndroid") - implementation project(":library-RxJava") + implementation Deps.rxAndroid + implementation Deps.rxKotlin + implementation Deps.rxJava implementation project(":core-domain") implementation project(":core-infra") diff --git a/feature-StoryDetail/build.gradle b/feature-StoryDetail/build.gradle index 4600ecc..5358cff 100644 --- a/feature-StoryDetail/build.gradle +++ b/feature-StoryDetail/build.gradle @@ -9,16 +9,17 @@ android { } dependencies { - implementation project(":library-AndroidX-Activity") - implementation project(":library-AndroidX-AppCompat") - implementation project(":library-AndroidX-ConstraintLayout") - implementation project(":library-AndroidX-RecyclerView") + implementation Deps.androidxActivity + implementation Deps.androidxAppCompat + implementation Deps.androidxConstraintLayout + implementation Deps.androidxRecyclerView - implementation project(":library-Timber") + implementation Deps.timber // Rx - implementation project(":library-RxAndroid") - implementation project(":library-RxJava") - implementation project(":library-LifecycleDisposable") + implementation Deps.lifecycleDisposable + implementation Deps.rxAndroid + implementation Deps.rxKotlin + implementation Deps.rxJava implementation project(":core-domain") implementation project(":core-infra") diff --git a/feature-StoryList/build.gradle b/feature-StoryList/build.gradle index cd8af5e..54b9742 100644 --- a/feature-StoryList/build.gradle +++ b/feature-StoryList/build.gradle @@ -9,17 +9,18 @@ android { } dependencies { - implementation project(":library-AndroidX-Activity") - implementation project(":library-AndroidX-AppCompat") - implementation project(":library-AndroidX-ConstraintLayout") - implementation project(":library-AndroidX-RecyclerView") + implementation Deps.androidxActivity + implementation Deps.androidxAppCompat + implementation Deps.androidxConstraintLayout + implementation Deps.androidxRecyclerView - implementation project(":library-Timber") - implementation project(":library-ThreeTenBP") + implementation Deps.timber + implementation Deps.threeTenBP // Rx - implementation project(":library-RxAndroid") - implementation project(":library-RxJava") - implementation project(":library-LifecycleDisposable") + implementation Deps.lifecycleDisposable + implementation Deps.rxAndroid + implementation Deps.rxKotlin + implementation Deps.rxJava implementation project(":core-domain") implementation project(":core-infra") diff --git a/library-ThreeTenBP/build.gradle b/library-ThreeTenBP/build.gradle index f38cbf9..b38301b 100644 --- a/library-ThreeTenBP/build.gradle +++ b/library-ThreeTenBP/build.gradle @@ -6,5 +6,5 @@ repositories { } dependencies { - api group: 'org.threeten', name: 'threetenbp', version: '1.3.8', classifier: 'no-tzdb' + api 'org.threeten:threetenbp:1.3.8:no-tzdb' } diff --git a/settings.gradle b/settings.gradle index f00ead3..22966b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,13 +6,13 @@ include ':core-service' include ':feature-StoryCore' include ':feature-StoryList' include ':feature-StoryDetail' -include ':library-AndroidX-Activity' -include ':library-AndroidX-AppCompat' -include ':library-AndroidX-ConstraintLayout' -include ':library-AndroidX-RecyclerView' -include ':library-LifecycleDisposable' -include ':library-RxAndroid' -include ':library-RxJava' -include ':library-ThreeTenABP' -include ':library-ThreeTenBP' -include ':library-Timber' +//include ':library-AndroidX-Activity' +//include ':library-AndroidX-AppCompat' +//include ':library-AndroidX-ConstraintLayout' +//include ':library-AndroidX-RecyclerView' +//include ':library-LifecycleDisposable' +//include ':library-RxAndroid' +//include ':library-RxJava' +//include ':library-ThreeTenABP' +//include ':library-ThreeTenBP' +//include ':library-Timber'