diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle index 9daa9da..aa39db6 100644 --- a/api-logansquare/build.gradle +++ b/api-logansquare/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - api project(":storable") + api project(":components-storable") api 'net.danlew:android.joda:2.9.9.4' implementation "com.android.support:support-annotations:$versions.supportLibrary" diff --git a/lifecycle-common/build.gradle b/lifecycle-common/build.gradle index e7ab339..76f9f0c 100644 --- a/lifecycle-common/build.gradle +++ b/lifecycle-common/build.gradle @@ -15,7 +15,7 @@ android { } dependencies { - api project(":navigation") + api project(":components-navigation") compileOnly "javax.inject:javax.inject:1" diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle index 0956030..67f0308 100644 --- a/lifecycle-rx/build.gradle +++ b/lifecycle-rx/build.gradle @@ -10,8 +10,8 @@ android { } dependencies { - api project(":utils") - api project(":logging") + api project(":components-utils") + api project(":components-logging") implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt index afcc376..dc6f5f4 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt @@ -9,10 +9,10 @@ import io.reactivex.Single import io.reactivex.disposables.Disposable import ru.touchin.livedata.destroyable.BaseDestroyable import ru.touchin.livedata.destroyable.Destroyable -import ru.touchin.livedata.event.CompletableEvent -import ru.touchin.livedata.event.MaybeEvent -import ru.touchin.livedata.event.ObservableEvent -import ru.touchin.livedata.event.SingleEvent +import ru.touchin.templates.livedata.event.CompletableEvent +import ru.touchin.templates.livedata.event.MaybeEvent +import ru.touchin.templates.livedata.event.ObservableEvent +import ru.touchin.templates.livedata.event.SingleEvent class BaseLiveDataDispatcher(private val destroyable: BaseDestroyable = BaseDestroyable()) : LiveDataDispatcher, Destroyable by destroyable { diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt index e1d7d8f..8ef3510 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt @@ -7,10 +7,10 @@ import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single import io.reactivex.disposables.Disposable -import ru.touchin.livedata.event.CompletableEvent -import ru.touchin.livedata.event.MaybeEvent -import ru.touchin.livedata.event.ObservableEvent -import ru.touchin.livedata.event.SingleEvent +import ru.touchin.templates.livedata.event.CompletableEvent +import ru.touchin.templates.livedata.event.MaybeEvent +import ru.touchin.templates.livedata.event.ObservableEvent +import ru.touchin.templates.livedata.event.SingleEvent interface LiveDataDispatcher { diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/CompletableEvent.kt similarity index 85% rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/CompletableEvent.kt index d0832ef..05fa013 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/CompletableEvent.kt @@ -1,4 +1,4 @@ -package ru.touchin.livedata.event +package ru.touchin.templates.livedata.event /** * Event class that emits from [io.reactivex.Completable]. diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/MaybeEvent.kt similarity index 89% rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/MaybeEvent.kt index 0f88077..779fa5e 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/MaybeEvent.kt @@ -1,4 +1,4 @@ -package ru.touchin.livedata.event +package ru.touchin.templates.livedata.event /** * Event class that emits from [io.reactivex.Maybe]. diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/ObservableEvent.kt similarity index 90% rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/ObservableEvent.kt index 5a6b8e2..02373d5 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/ObservableEvent.kt @@ -1,4 +1,4 @@ -package ru.touchin.livedata.event +package ru.touchin.templates.livedata.event /** * Event class that emits from [io.reactivex.Observable]. diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/SingleEvent.kt similarity index 88% rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/SingleEvent.kt index 8b53f63..f023393 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/SingleEvent.kt @@ -1,4 +1,4 @@ -package ru.touchin.livedata.event +package ru.touchin.templates.livedata.event /** * Event class that emits from [io.reactivex.Single]. diff --git a/modules.gradle b/modules.gradle new file mode 100644 index 0000000..fa997e9 --- /dev/null +++ b/modules.gradle @@ -0,0 +1,24 @@ +final String rootDir +if (gradle.ext.has('componentsRoot')) { + rootDir = gradle.ext['componentsRoot'] +} else { + rootDir = settingsDir +} + +include ':components-logging' +include ':components-utils' +include ':components-navigation' +include ':components-storable' +include ':components-api-logansquare' +include ':components-lifecycle-common' +include ':components-lifecycle-rx' +include ':components-views' + +project(':components-utils').projectDir = new File(rootDir, 'utils') +project(':components-logging').projectDir = new File(rootDir, 'logging') +project(':components-navigation').projectDir = new File(rootDir, 'navigation') +project(':components-storable').projectDir = new File(rootDir, 'storable') +project(':components-api-logansquare').projectDir = new File(rootDir, 'api-logansquare') +project(':components-lifecycle-common').projectDir = new File(rootDir, 'lifecycle-common') +project(':components-lifecycle-rx').projectDir = new File(rootDir, 'lifecycle-rx') +project(':components-views').projectDir = new File(rootDir, 'views') diff --git a/navigation/build.gradle b/navigation/build.gradle index 8a95e1c..43b0e28 100644 --- a/navigation/build.gradle +++ b/navigation/build.gradle @@ -15,8 +15,8 @@ android { } dependencies { - api project(":utils") - api project(":logging") + api project(":components-utils") + api project(":components-logging") implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/settings.gradle b/settings.gradle index 3e31f83..c8a70f0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ -include ':sample', ':utils', ':logging', ':navigation', ':storable', ':api-logansquare', ':lifecycle-common', ':lifecycle-rx', ':views' +apply from: 'modules.gradle' + +include 'sample' diff --git a/storable/build.gradle b/storable/build.gradle index 18cb730..3afe4ee 100644 --- a/storable/build.gradle +++ b/storable/build.gradle @@ -14,8 +14,8 @@ android { } dependencies { - api project(":utils") - api project(":logging") + api project(":components-utils") + api project(":components-logging") implementation "com.android.support:support-annotations:$versions.supportLibrary" diff --git a/views/build.gradle b/views/build.gradle index 9ea4f9e..992dbea 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -14,8 +14,8 @@ android { } dependencies { - api project(":utils") - api project(":logging") + api project(":components-utils") + api project(":components-logging") implementation "com.android.support:design:$versions.supportLibrary" }