diff --git a/CHANGELOG.md b/CHANGELOG.md index b205629b1..6239dbebd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log for Dispatch +## Version 1.0.0-beta08 + +* Remove FlowCancellationException ([#196](https://github.com/RBusarow/Dispatch/issues/196)) +* Update Kotlin to [1.4.21](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md#1421) + ## Version 1.0.0-beta07 * Update to coroutines to [1.4.2](https://github.com/Kotlin/kotlinx.coroutines/releases/tag/1.4.2) diff --git a/README.md b/README.md index 564c4fc72..b87141b81 100644 --- a/README.md +++ b/README.md @@ -365,14 +365,14 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") // everything provides :core via "api", so you only need this if you have no other "implementation" dispatch artifacts - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // LifecycleCoroutineScope for Android Fragments, Activities, etc. - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta08") // lifecycleScope extension function with a settable factory. Use this if you don't DI your CoroutineScopes // This provides :dispatch-android-lifecycle via "api", so you don't need to declare both - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta08") // ViewModelScope for Android ViewModels - implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta08") /* jvm testing @@ -381,15 +381,15 @@ dependencies { // core coroutines-test testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") // you only need this if you don't have the -junit4 or -junit5 artifacts - testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta08") // CoroutineTestRule and :dispatch-test // This provides :dispatch-test via "api", so you don't need to declare both // This can be used at the same time as :dispatch-test-junit5 - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") // CoroutineTest, CoroutineTestExtension, and :dispatch-test // This provides :dispatch-test via "api", so you don't need to declare both // This can be used at the same time as :dispatch-test-junit4 - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") /* Android testing */ @@ -398,7 +398,7 @@ dependencies { androidTestImplementation("androidx.test:runner:1.3.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") // IdlingDispatcher, IdlingDispatcherProvider, and IdlingCoroutineScope - androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta07") + androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta08") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 4a0e15f9e..806ab8c64 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -136,37 +136,6 @@ subprojects { } } -allprojects { - // force Java 8 source when building java-only artifacts. This is different than the Kotlin jvm target. - pluginManager.withPlugin("java") { - configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - } -} - - -subprojects { - tasks.withType() - .configureEach { - - kotlinOptions { - allWarningsAsErrors = true - - jvmTarget = "1.8" - - // https://youtrack.jetbrains.com/issue/KT-24946 - // freeCompilerArgs = listOf( - // "-progressive", - // "-Xskip-runtime-version-check", - // "-Xdisable-default-scripting-plugin", - // "-Xuse-experimental=kotlin.Experimental" - // ) - } - } -} - val cleanDocs by tasks.registering { description = "cleans /docs" @@ -292,32 +261,6 @@ val sortDependencies by tasks.registering { } } -subprojects { - - // force update all transitive dependencies (prevents some library leaking an old version) - configurations.all { - resolutionStrategy { - force( - Libs.Kotlin.reflect, - // androidx is currently leaking coroutines 1.1.1 everywhere - Libs.Kotlinx.Coroutines.core, - Libs.Kotlinx.Coroutines.test, - Libs.Kotlinx.Coroutines.android, - // prevent dependency libraries from leaking their own old version of this library - Libs.RickBusarow.Dispatch.core, - Libs.RickBusarow.Dispatch.detekt, - Libs.RickBusarow.Dispatch.espresso, - Libs.RickBusarow.Dispatch.lifecycle, - Libs.RickBusarow.Dispatch.lifecycleExtensions, - Libs.RickBusarow.Dispatch.viewModel, - Libs.RickBusarow.Dispatch.Test.core, - Libs.RickBusarow.Dispatch.Test.jUnit4, - Libs.RickBusarow.Dispatch.Test.jUnit5 - ) - } - } -} - dependencyAnalysis { issues { all { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2dcdb3bf2..edf10146c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { compileOnly(gradleApi()) - implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.20") // update Dependencies.kt as well - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20") // update Dependencies.kt as well + implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.21") // update Dependencies.kt as well + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21") // update Dependencies.kt as well implementation("com.android.tools.build:gradle:4.1.0") // update Dependencies.kt as well } diff --git a/buildSrc/src/main/kotlin/Common.kt b/buildSrc/src/main/kotlin/Common.kt new file mode 100644 index 000000000..c7dd45e1a --- /dev/null +++ b/buildSrc/src/main/kotlin/Common.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2020 Rick Busarow + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:Suppress("LongMethod", "TopLevelPropertyNaming") + +import org.gradle.api.* +import org.gradle.kotlin.dsl.* +import org.jetbrains.kotlin.gradle.tasks.* + +fun Project.common() { + + tasks.withType() + .configureEach { + + kotlinOptions { + + allWarningsAsErrors = true + + jvmTarget = "1.8" + } + } + +// force update all transitive dependencies (prevents some library leaking an old version) + configurations.all { + resolutionStrategy { + force( + Libs.Kotlin.reflect, + // androidx is currently leaking coroutines 1.1.1 everywhere + Libs.Kotlinx.Coroutines.core, + Libs.Kotlinx.Coroutines.test, + Libs.Kotlinx.Coroutines.android, + // prevent dependency libraries from leaking their own old version of this library + Libs.RickBusarow.Dispatch.core, + Libs.RickBusarow.Dispatch.detekt, + Libs.RickBusarow.Dispatch.espresso, + Libs.RickBusarow.Dispatch.lifecycle, + Libs.RickBusarow.Dispatch.lifecycleExtensions, + Libs.RickBusarow.Dispatch.viewModel, + Libs.RickBusarow.Dispatch.Test.core, + Libs.RickBusarow.Dispatch.Test.jUnit4, + Libs.RickBusarow.Dispatch.Test.jUnit5 + ) + } + } + +} diff --git a/buildSrc/src/main/kotlin/CommonAndroid.kt b/buildSrc/src/main/kotlin/CommonAndroid.kt new file mode 100644 index 000000000..2c6cd8816 --- /dev/null +++ b/buildSrc/src/main/kotlin/CommonAndroid.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2020 Rick Busarow + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:Suppress("LongMethod") + +import com.android.build.gradle.* +import org.gradle.api.* +import org.gradle.api.JavaVersion.* +import org.gradle.kotlin.dsl.* +import java.io.* + +fun Project.commonAndroid() { + + configure { + compileSdkVersion(Versions.compileSdk) + + defaultConfig { + minSdkVersion(Versions.minSdk) + targetSdkVersion(Versions.targetSdk) + versionName = Versions.versionName + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + getByName("release") { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = VERSION_1_8 + targetCompatibility = VERSION_1_8 + } + + lintOptions { + disable("ObsoleteLintCustomCheck") + disable("MissingTranslation") + enable("InvalidPackage") + enable("Interoperability") + isAbortOnError = true + baselineFile = File("$projectDir/lint-baseline.xml") + } + + testOptions { + unitTests.isIncludeAndroidResources = true + unitTests.isReturnDefaultValues = true + animationsDisabled = true + } + } +} + diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 1f6ca4ca4..9796ee1fd 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -54,11 +54,11 @@ object Versions { const val benManes = "0.33.0" const val gradleWrapper = "4.1.0" const val dagger = "2.25.2" - const val kotlin = "1.4.20" + const val kotlin = "1.4.21" const val mavenPublish = "0.13.0" const val taskTree = "1.5" - const val versionName = "1.0.0-beta07" + const val versionName = "1.0.0-beta08" } object BuildPlugins { diff --git a/buildSrc/src/main/kotlin/androidLibrary.gradle.kts b/buildSrc/src/main/kotlin/androidLibrary.gradle.kts new file mode 100644 index 000000000..fddcf9cf5 --- /dev/null +++ b/buildSrc/src/main/kotlin/androidLibrary.gradle.kts @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2020 Rick Busarow + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +apply(plugin = "com.android.library") +apply(plugin = "org.jetbrains.kotlin.android") + +commonAndroid() +common() + +val testJvm by tasks.registering { + dependsOn("testDebugUnitTest") +} + +val buildTests by tasks.registering { + dependsOn("assembleDebugUnitTest") +} diff --git a/buildSrc/src/main/kotlin/javaLibrary.gradle.kts b/buildSrc/src/main/kotlin/javaLibrary.gradle.kts new file mode 100644 index 000000000..e7fb4b574 --- /dev/null +++ b/buildSrc/src/main/kotlin/javaLibrary.gradle.kts @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 Rick Busarow + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + kotlin("jvm") +} + +common() + +java { + // force Java 8 source when building java-only artifacts. + // This is different than the Kotlin jvm target. + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +val testJvm by tasks.registering { + dependsOn("test") +} + +val buildTests by tasks.registering { + dependsOn("testClasses") +} + +dependencies { + + api(Libs.Kotlinx.Coroutines.core) + api(Libs.Kotlinx.Coroutines.coreJvm) +} diff --git a/dispatch-android-espresso/README.md b/dispatch-android-espresso/README.md index e6bf1504d..3c25192d6 100644 --- a/dispatch-android-espresso/README.md +++ b/dispatch-android-espresso/README.md @@ -90,9 +90,9 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") - androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta07") + androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta08") // android androidTestImplementation("androidx.test:runner:1.3.0") diff --git a/dispatch-android-espresso/build.gradle.kts b/dispatch-android-espresso/build.gradle.kts index dba164207..9dd09c931 100644 --- a/dispatch-android-espresso/build.gradle.kts +++ b/dispatch-android-espresso/build.gradle.kts @@ -14,31 +14,11 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") + androidLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - } -} - dependencies { api(Libs.AndroidX.Test.Espresso.idlingResource) diff --git a/dispatch-android-espresso/samples/build.gradle.kts b/dispatch-android-espresso/samples/build.gradle.kts index 92b5b6b60..19cb0bb95 100644 --- a/dispatch-android-espresso/samples/build.gradle.kts +++ b/dispatch-android-espresso/samples/build.gradle.kts @@ -14,27 +14,7 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") -} - -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - } + androidLibrary } dependencies { diff --git a/dispatch-android-lifecycle-extensions/README.md b/dispatch-android-lifecycle-extensions/README.md index 157233236..2636f7e59 100644 --- a/dispatch-android-lifecycle-extensions/README.md +++ b/dispatch-android-lifecycle-extensions/README.md @@ -141,7 +141,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta08") implementation("androidx.lifecycle:lifecycle-common:2.2.0") } diff --git a/dispatch-android-lifecycle-extensions/build.gradle.kts b/dispatch-android-lifecycle-extensions/build.gradle.kts index 708b9677b..98764152f 100644 --- a/dispatch-android-lifecycle-extensions/build.gradle.kts +++ b/dispatch-android-lifecycle-extensions/build.gradle.kts @@ -14,34 +14,11 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") + androidLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } -} - dependencies { api(Libs.AndroidX.Fragment.core) diff --git a/dispatch-android-lifecycle-extensions/samples/build.gradle.kts b/dispatch-android-lifecycle-extensions/samples/build.gradle.kts index a5d5392c4..4ef4df662 100644 --- a/dispatch-android-lifecycle-extensions/samples/build.gradle.kts +++ b/dispatch-android-lifecycle-extensions/samples/build.gradle.kts @@ -14,27 +14,7 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") -} - -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - } + androidLibrary } dependencies { diff --git a/dispatch-android-lifecycle/README.md b/dispatch-android-lifecycle/README.md index d0cbc6d77..7c5ec02c7 100644 --- a/dispatch-android-lifecycle/README.md +++ b/dispatch-android-lifecycle/README.md @@ -59,7 +59,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta08") implementation("androidx.lifecycle:lifecycle-common:2.2.0") } ``` diff --git a/dispatch-android-lifecycle/build.gradle.kts b/dispatch-android-lifecycle/build.gradle.kts index a75e585d1..dd39c08e5 100644 --- a/dispatch-android-lifecycle/build.gradle.kts +++ b/dispatch-android-lifecycle/build.gradle.kts @@ -14,34 +14,11 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") + androidLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } -} - dependencies { api(Libs.AndroidX.Lifecycle.common) diff --git a/dispatch-android-lifecycle/samples/build.gradle.kts b/dispatch-android-lifecycle/samples/build.gradle.kts index e17ed570d..197e95549 100644 --- a/dispatch-android-lifecycle/samples/build.gradle.kts +++ b/dispatch-android-lifecycle/samples/build.gradle.kts @@ -14,27 +14,7 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") -} - -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - } + androidLibrary } dependencies { diff --git a/dispatch-android-lifecycle/src/main/java/dispatch/android/lifecycle/internal/dispatchLifecycleScope.kt b/dispatch-android-lifecycle/src/main/java/dispatch/android/lifecycle/internal/dispatchLifecycleScope.kt index 8367c00f4..d77f1b1d2 100644 --- a/dispatch-android-lifecycle/src/main/java/dispatch/android/lifecycle/internal/dispatchLifecycleScope.kt +++ b/dispatch-android-lifecycle/src/main/java/dispatch/android/lifecycle/internal/dispatchLifecycleScope.kt @@ -46,27 +46,25 @@ internal suspend fun Lifecycle.onNext( var result: T? = null val stateReached = AtomicBoolean(false) - - try { - // suspend until the lifecycle's flow has reached the minimum state, then move on - eventFlow(minimumState) - .onEachLatest { stateIsHighEnough -> - if (stateIsHighEnough) { - stateReached.compareAndSet(false, true) - coroutineScope { - withContext(context + coroutineContext[Job]!!) { - result = block() - } + var completed = false + + // suspend until the lifecycle's flow has reached the minimum state, then move on + eventFlow(minimumState) + .onEachLatest { stateIsHighEnough -> + if (stateIsHighEnough) { + stateReached.compareAndSet(false, true) + coroutineScope { + withContext(context + coroutineContext[Job]!!) { + result = block() } - throw FlowCancellationException() } + completed = true } - .collectUntil { stateIsHighEnough -> - !stateIsHighEnough && stateReached.get() - } - } catch (e: FlowCancellationException) { - // do nothing - } + } + .takeWhile { !completed } + .collectUntil { stateIsHighEnough -> + !stateIsHighEnough && stateReached.get() + } return result } @@ -125,8 +123,6 @@ internal fun Lifecycle.eventFlow( // Don't send [true, true] since the second true would cancel the already-active block. .distinctUntilChanged() -private class FlowCancellationException : CancellationException("Flow was aborted") - /** * Terminal operator which collects the given [Flow] until the [predicate] returns true. */ diff --git a/dispatch-android-viewmodel/README.md b/dispatch-android-viewmodel/README.md index 8e9baf52e..7fa4babcb 100644 --- a/dispatch-android-viewmodel/README.md +++ b/dispatch-android-viewmodel/README.md @@ -178,7 +178,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta08") } ``` diff --git a/dispatch-android-viewmodel/build.gradle.kts b/dispatch-android-viewmodel/build.gradle.kts index 18444c8f0..142c48c1b 100644 --- a/dispatch-android-viewmodel/build.gradle.kts +++ b/dispatch-android-viewmodel/build.gradle.kts @@ -14,31 +14,11 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") + androidLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - } -} - dependencies { api(project(":dispatch-core")) diff --git a/dispatch-android-viewmodel/samples/build.gradle.kts b/dispatch-android-viewmodel/samples/build.gradle.kts index cad00ac8c..db7d89800 100644 --- a/dispatch-android-viewmodel/samples/build.gradle.kts +++ b/dispatch-android-viewmodel/samples/build.gradle.kts @@ -14,27 +14,7 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") -} - -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - } + androidLibrary } dependencies { diff --git a/dispatch-core/README.md b/dispatch-core/README.md index 04bb3e786..cf76565ac 100644 --- a/dispatch-core/README.md +++ b/dispatch-core/README.md @@ -203,7 +203,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") } ``` diff --git a/dispatch-core/build.gradle.kts b/dispatch-core/build.gradle.kts index 2f3da2b08..08df446e7 100644 --- a/dispatch-core/build.gradle.kts +++ b/dispatch-core/build.gradle.kts @@ -14,7 +14,7 @@ */ plugins { - kotlin("jvm") + javaLibrary id(Plugins.mavenPublish) id(Plugins.dokka) id(Plugins.atomicFu) diff --git a/dispatch-core/samples/build.gradle.kts b/dispatch-core/samples/build.gradle.kts index fef0b037e..ae2f27064 100644 --- a/dispatch-core/samples/build.gradle.kts +++ b/dispatch-core/samples/build.gradle.kts @@ -16,7 +16,7 @@ import kotlinx.atomicfu.plugin.gradle.* plugins { - kotlin("jvm") + javaLibrary } sourceSets["test"].java.srcDir("test") diff --git a/dispatch-detekt/README.md b/dispatch-detekt/README.md index 49cdb3ed1..efe9536e8 100644 --- a/dispatch-detekt/README.md +++ b/dispatch-detekt/README.md @@ -34,7 +34,7 @@ allprojects { dependencies { detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.14.2") - detektPlugins("com.rickbusarow.dispatch:dispatch-detekt:1.0.0-beta07") + detektPlugins("com.rickbusarow.dispatch:dispatch-detekt:1.0.0-beta08") } } ``` diff --git a/dispatch-detekt/build.gradle.kts b/dispatch-detekt/build.gradle.kts index f2df5dc22..8e4787c4d 100644 --- a/dispatch-detekt/build.gradle.kts +++ b/dispatch-detekt/build.gradle.kts @@ -14,7 +14,7 @@ */ plugins { - kotlin("jvm") + javaLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } diff --git a/dispatch-detekt/samples/build.gradle.kts b/dispatch-detekt/samples/build.gradle.kts index bd6f93584..75bbc09b6 100644 --- a/dispatch-detekt/samples/build.gradle.kts +++ b/dispatch-detekt/samples/build.gradle.kts @@ -16,7 +16,7 @@ import kotlinx.atomicfu.plugin.gradle.* plugins { - kotlin("jvm") + javaLibrary } sourceSets["test"].java.srcDir("test") diff --git a/dispatch-internal-test-android/build.gradle.kts b/dispatch-internal-test-android/build.gradle.kts index 9bda98879..595a0b9f3 100644 --- a/dispatch-internal-test-android/build.gradle.kts +++ b/dispatch-internal-test-android/build.gradle.kts @@ -14,30 +14,7 @@ */ plugins { - id(Plugins.androidLibrary) - kotlin("android") -} - -android { - compileSdkVersion(Versions.compileSdk) - - defaultConfig { - minSdkVersion(Versions.minSdk) - targetSdkVersion(Versions.targetSdk) - versionName = Versions.versionName - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - getByName("release") { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } + androidLibrary } dependencies { diff --git a/dispatch-internal-test/build.gradle.kts b/dispatch-internal-test/build.gradle.kts index fb17590b7..e9042feb2 100644 --- a/dispatch-internal-test/build.gradle.kts +++ b/dispatch-internal-test/build.gradle.kts @@ -15,7 +15,7 @@ plugins { id(Plugins.atomicFu) - kotlin("jvm") + javaLibrary } dependencies { diff --git a/dispatch-test-junit4/README.md b/dispatch-test-junit4/README.md index 8874879dd..a7fdb85f2 100644 --- a/dispatch-test-junit4/README.md +++ b/dispatch-test-junit4/README.md @@ -73,10 +73,10 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit4 artifact also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") } ``` @@ -97,11 +97,11 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit4 and junit5 artifacts also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") } ``` diff --git a/dispatch-test-junit4/build.gradle.kts b/dispatch-test-junit4/build.gradle.kts index 0fad3286a..ccaae4b09 100644 --- a/dispatch-test-junit4/build.gradle.kts +++ b/dispatch-test-junit4/build.gradle.kts @@ -15,7 +15,7 @@ plugins { id(Plugins.atomicFu) - kotlin("jvm") + javaLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } diff --git a/dispatch-test-junit4/samples/build.gradle.kts b/dispatch-test-junit4/samples/build.gradle.kts index 501004b03..0c0e612bf 100644 --- a/dispatch-test-junit4/samples/build.gradle.kts +++ b/dispatch-test-junit4/samples/build.gradle.kts @@ -14,7 +14,7 @@ */ plugins { - kotlin("jvm") + javaLibrary } sourceSets["test"].java.srcDir("test") diff --git a/dispatch-test-junit5/README.md b/dispatch-test-junit5/README.md index bd201fb03..ecc32680e 100644 --- a/dispatch-test-junit5/README.md +++ b/dispatch-test-junit5/README.md @@ -103,10 +103,10 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit5 artifact also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") testImplementation("org.junit.jupiter:junit-jupiter:5.7.0") } @@ -128,11 +128,11 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit4 and junit5 artifacts also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") testImplementation("org.junit.jupiter:junit-jupiter:5.7.0") testImplementation("org.junit.vintage:junit-vintage-engine:5.7.0") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") diff --git a/dispatch-test-junit5/build.gradle.kts b/dispatch-test-junit5/build.gradle.kts index df957e912..c08b02868 100644 --- a/dispatch-test-junit5/build.gradle.kts +++ b/dispatch-test-junit5/build.gradle.kts @@ -15,7 +15,7 @@ plugins { id(Plugins.atomicFu) - kotlin("jvm") + javaLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } diff --git a/dispatch-test-junit5/samples/build.gradle.kts b/dispatch-test-junit5/samples/build.gradle.kts index 41f056f57..08b383079 100644 --- a/dispatch-test-junit5/samples/build.gradle.kts +++ b/dispatch-test-junit5/samples/build.gradle.kts @@ -16,7 +16,7 @@ import kotlinx.atomicfu.plugin.gradle.* plugins { - kotlin("jvm") + javaLibrary } sourceSets["test"].java.srcDir("test") diff --git a/dispatch-test/README.md b/dispatch-test/README.md index 8c653893a..a18bb6a27 100644 --- a/dispatch-test/README.md +++ b/dispatch-test/README.md @@ -122,9 +122,9 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") - testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") } ``` diff --git a/dispatch-test/build.gradle.kts b/dispatch-test/build.gradle.kts index ea364e87c..58c085ad8 100644 --- a/dispatch-test/build.gradle.kts +++ b/dispatch-test/build.gradle.kts @@ -15,7 +15,7 @@ plugins { id(Plugins.atomicFu) - kotlin("jvm") + javaLibrary id(Plugins.mavenPublish) id(Plugins.dokka) } diff --git a/dispatch-test/samples/build.gradle.kts b/dispatch-test/samples/build.gradle.kts index 4d5e3b4eb..471129de6 100644 --- a/dispatch-test/samples/build.gradle.kts +++ b/dispatch-test/samples/build.gradle.kts @@ -16,7 +16,7 @@ import kotlinx.atomicfu.plugin.gradle.* plugins { - kotlin("jvm") + javaLibrary } sourceSets["test"].java.srcDir("test") diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b205629b1..01f0afd0f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log for Dispatch +## Version 1.0.0-beta08 (unreleased) + +* Remove FlowCancellationException ([#196](https://github.com/RBusarow/Dispatch/issues/196)) +* Update Kotlin to [1.4.21](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md#1421) + ## Version 1.0.0-beta07 * Update to coroutines to [1.4.2](https://github.com/Kotlin/kotlinx.coroutines/releases/tag/1.4.2) diff --git a/docs/dispatch-android-espresso.md b/docs/dispatch-android-espresso.md index e6bf1504d..3c25192d6 100644 --- a/docs/dispatch-android-espresso.md +++ b/docs/dispatch-android-espresso.md @@ -90,9 +90,9 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") - androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta07") + androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta08") // android androidTestImplementation("androidx.test:runner:1.3.0") diff --git a/docs/dispatch-android-lifecycle-extensions.md b/docs/dispatch-android-lifecycle-extensions.md index 157233236..2636f7e59 100644 --- a/docs/dispatch-android-lifecycle-extensions.md +++ b/docs/dispatch-android-lifecycle-extensions.md @@ -141,7 +141,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta08") implementation("androidx.lifecycle:lifecycle-common:2.2.0") } diff --git a/docs/dispatch-android-lifecycle.md b/docs/dispatch-android-lifecycle.md index d0cbc6d77..7c5ec02c7 100644 --- a/docs/dispatch-android-lifecycle.md +++ b/docs/dispatch-android-lifecycle.md @@ -59,7 +59,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta08") implementation("androidx.lifecycle:lifecycle-common:2.2.0") } ``` diff --git a/docs/dispatch-android-viewmodel.md b/docs/dispatch-android-viewmodel.md index 8e9baf52e..7fa4babcb 100644 --- a/docs/dispatch-android-viewmodel.md +++ b/docs/dispatch-android-viewmodel.md @@ -178,7 +178,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta08") } ``` diff --git a/docs/dispatch-core.md b/docs/dispatch-core.md index 04bb3e786..cf76565ac 100644 --- a/docs/dispatch-core.md +++ b/docs/dispatch-core.md @@ -203,7 +203,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") } ``` diff --git a/docs/dispatch-detekt.md b/docs/dispatch-detekt.md index 49cdb3ed1..efe9536e8 100644 --- a/docs/dispatch-detekt.md +++ b/docs/dispatch-detekt.md @@ -34,7 +34,7 @@ allprojects { dependencies { detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.14.2") - detektPlugins("com.rickbusarow.dispatch:dispatch-detekt:1.0.0-beta07") + detektPlugins("com.rickbusarow.dispatch:dispatch-detekt:1.0.0-beta08") } } ``` diff --git a/docs/dispatch-test-junit4.md b/docs/dispatch-test-junit4.md index 8874879dd..a7fdb85f2 100644 --- a/docs/dispatch-test-junit4.md +++ b/docs/dispatch-test-junit4.md @@ -73,10 +73,10 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit4 artifact also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") } ``` @@ -97,11 +97,11 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit4 and junit5 artifacts also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") } ``` diff --git a/docs/dispatch-test-junit5.md b/docs/dispatch-test-junit5.md index bd201fb03..ecc32680e 100644 --- a/docs/dispatch-test-junit5.md +++ b/docs/dispatch-test-junit5.md @@ -103,10 +103,10 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit5 artifact also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") testImplementation("org.junit.jupiter:junit-jupiter:5.7.0") } @@ -128,11 +128,11 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // the junit4 and junit5 artifacts also provides the dispatch-test artifact - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") testImplementation("org.junit.jupiter:junit-jupiter:5.7.0") testImplementation("org.junit.vintage:junit-vintage-engine:5.7.0") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") diff --git a/docs/dispatch-test.md b/docs/dispatch-test.md index 8c653893a..a18bb6a27 100644 --- a/docs/dispatch-test.md +++ b/docs/dispatch-test.md @@ -122,9 +122,9 @@ dependencies { // core implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") - testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta08") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") } ``` diff --git a/docs/index.md b/docs/index.md index 564c4fc72..b87141b81 100644 --- a/docs/index.md +++ b/docs/index.md @@ -365,14 +365,14 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2") // everything provides :core via "api", so you only need this if you have no other "implementation" dispatch artifacts - implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta08") // LifecycleCoroutineScope for Android Fragments, Activities, etc. - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta08") // lifecycleScope extension function with a settable factory. Use this if you don't DI your CoroutineScopes // This provides :dispatch-android-lifecycle via "api", so you don't need to declare both - implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta08") // ViewModelScope for Android ViewModels - implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta07") + implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta08") /* jvm testing @@ -381,15 +381,15 @@ dependencies { // core coroutines-test testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") // you only need this if you don't have the -junit4 or -junit5 artifacts - testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta08") // CoroutineTestRule and :dispatch-test // This provides :dispatch-test via "api", so you don't need to declare both // This can be used at the same time as :dispatch-test-junit5 - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta08") // CoroutineTest, CoroutineTestExtension, and :dispatch-test // This provides :dispatch-test via "api", so you don't need to declare both // This can be used at the same time as :dispatch-test-junit4 - testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta07") + testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta08") /* Android testing */ @@ -398,7 +398,7 @@ dependencies { androidTestImplementation("androidx.test:runner:1.3.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") // IdlingDispatcher, IdlingDispatcherProvider, and IdlingCoroutineScope - androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta07") + androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta08") } ``` diff --git a/gradle.properties b/gradle.properties index 659667e5b..8c559c6a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ android.enableJetifier=false android.lifecycleProcessor.incremental=true # Maven GROUP=com.rickbusarow.dispatch -VERSION_NAME=1.0.0-beta07 +VERSION_NAME=1.0.0-beta08 POM_DESCRIPTION=Quality of life coroutine utilities. POM_INCEPTION_YEAR=2019 POM_URL=https://github.com/rbusarow/Dispatch diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383ef..ae6a8704c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,20 @@ +# +# Copyright (C) 2020 Rick Busarow +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists