Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dependency updates #185

Merged
merged 1 commit into from
Oct 31, 2020
Merged

dependency updates #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
/.idea/
/projectFilesBackup/.idea/
!/.idea/scopes/*
/docs/api/
1 change: 0 additions & 1 deletion .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,53 +361,53 @@ dependencies {
*/

// core coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")

// 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-beta04")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

// LifecycleCoroutineScope for Android Fragments, Activities, etc.
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta04")
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta05")

// 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-beta04")
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta05")

// ViewModelScope for Android ViewModels
implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta04")
implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta05")


/*
jvm testing
*/

// core coroutines-test
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.0")

// you only need this if you don't have the -junit4 or -junit5 artifacts
testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta04")
testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta05")

// 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-beta04")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta05")

// 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-junit4:1.0.0-beta04")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta05")

/*
Android testing
*/

// core android
androidTestImplementation("androidx.test:runner:1.2.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
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-beta04")
androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta05")
}
```

Expand Down
17 changes: 16 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
@file:Suppress("MagicNumber")

import com.github.benmanes.gradle.versions.updates.*
import formatting.*
import io.gitlab.arturbosch.detekt.*
import kotlinx.knit.*
Expand All @@ -35,7 +36,6 @@ buildscript {

classpath(BuildPlugins.androidGradlePlugin)
classpath(BuildPlugins.atomicFu)
classpath(BuildPlugins.benManesVersions)
classpath(BuildPlugins.binaryCompatibility)
classpath(BuildPlugins.kotlinGradlePlugin)
classpath(BuildPlugins.gradleMavenPublish)
Expand All @@ -44,6 +44,7 @@ buildscript {
}

plugins {
id(Plugins.benManes) version Versions.benManes
id(Plugins.dependencyAnalysis) version Versions.dependencyAnalysis
id(Plugins.gradleDoctor) version Versions.gradleDoctor
id(Plugins.detekt) version Libs.Detekt.version
Expand Down Expand Up @@ -312,3 +313,17 @@ dependencyAnalysis {
}
}
}


fun isNonStable(version: String): Boolean {
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
val isStable = stableKeyword || regex.matches(version)
return isStable.not()
}

tasks.named("dependencyUpdates", DependencyUpdatesTask::class.java).configure {
rejectVersionIf {
isNonStable(candidate.version) && !isNonStable(currentVersion)
}
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ dependencies {

implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.10") // update Dependencies.kt as well
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10") // update Dependencies.kt as well
implementation("com.android.tools.build:gradle:4.0.0") // update Dependencies.kt as well
implementation("com.android.tools.build:gradle:4.1.0") // update Dependencies.kt as well
}
17 changes: 9 additions & 8 deletions buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,29 @@ object Plugins {

const val mavenPublish = "com.vanniktech.maven.publish"
const val taskTree = "com.dorongold.task-tree"
const val benManes = "com.github.ben-manes.versions"
}

object Versions {
const val ktlint = "0.35.0"
const val dokka = "1.4.10"
const val dependencyAnalysis = "0.59.0"
const val dependencyAnalysis = "0.64.0"
const val knit = "0.2.2"
const val gradleDoctor = "0.6.2"
const val gradleDoctor = "0.6.3"

const val compileSdk = 29
const val minSdk = "21"
const val targetSdk = 29

const val binaryCompatibility = "0.2.3"
const val benManes = "0.27.0"
const val gradleWrapper = "4.0.0"
const val benManes = "0.33.0"
const val gradleWrapper = "4.1.0"
const val dagger = "2.25.2"
const val kotlin = "1.4.10"
const val mavenPublish = "0.13.0"

const val taskTree = "1.5"
const val versionName = "1.0.0-beta04"
const val versionName = "1.0.0-beta05"
}

object BuildPlugins {
Expand All @@ -69,7 +70,7 @@ object BuildPlugins {

const val binaryCompatibility =
"org.jetbrains.kotlinx:binary-compatibility-validator:${Versions.binaryCompatibility}"
const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.14.3"
const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.14.4"

const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.gradleWrapper}"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
Expand All @@ -86,7 +87,7 @@ object Libs {
object AndroidX {
const val activity = "androidx.activity:activity-ktx:1.1.0"
const val appcompat = "androidx.appcompat:appcompat:1.2.0"
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.0.2"
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.0.4"
const val coreKtx = "androidx.core:core-ktx:1.3.2"

object Fragment {
Expand Down Expand Up @@ -173,7 +174,7 @@ object Libs {
}

object Kotest {
private const val version = "4.3.0"
private const val version = "4.3.1"
const val assertions = "io.kotest:kotest-assertions-core-jvm:$version"
const val assertionsShared = "io.kotest:kotest-assertions-shared-jvm:$version"
const val commonJvm = "io.kotest:kotest-common-jvm:$version"
Expand Down
12 changes: 6 additions & 6 deletions dispatch-android-espresso/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta04")
androidTestImplementation("com.rickbusarow.dispatch:dispatch-android-espresso:1.0.0-beta05")

// android
androidTestImplementation("androidx.test:runner:1.2.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
androidTestImplementation("androidx.test:runner:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
}
```

Expand Down
6 changes: 3 additions & 3 deletions dispatch-android-lifecycle-extensions/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions:1.0.0-beta05")

implementation("androidx.lifecycle:lifecycle-common:2.2.0")
}
Expand Down
6 changes: 3 additions & 3 deletions dispatch-android-lifecycle/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle:1.0.0-beta05")
implementation("androidx.lifecycle:lifecycle-common:2.2.0")
}
```
Expand Down
6 changes: 3 additions & 3 deletions dispatch-android-viewmodel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel:1.0.0-beta05")
}
```

Expand Down
6 changes: 3 additions & 3 deletions dispatch-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")
}
```

Expand Down
4 changes: 2 additions & 2 deletions dispatch-detekt/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ In root project-level `build.gradle` or `build.gradle.kts`:
``` kotlin
allprojects {
dependencies {
detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.14.1")
detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.14.2")

detektPlugins("com.rickbusarow.dispatch:dispatch-detekt:1.0.0-beta04")
detektPlugins("com.rickbusarow.dispatch:dispatch-detekt:1.0.0-beta05")
}
}
```
Expand Down
22 changes: 11 additions & 11 deletions dispatch-test-junit4/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

// the junit4 artifact also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta04")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta05")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.0")
}
```

Expand All @@ -95,14 +95,14 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

// the junit4 and junit5 artifacts also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta04")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta04")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta05")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta05")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.0")
}
```

Expand Down
28 changes: 14 additions & 14 deletions dispatch-test-junit5/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

// the junit5 artifact also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta04")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta05")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
}
```

Expand All @@ -126,16 +126,16 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

// the junit4 and junit5 artifacts also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta04")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta04")
testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
testImplementation("org.junit.vintage:junit-vintage-engine:5.6.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-beta05")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-beta05")
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.0")
}
```

Expand Down
10 changes: 5 additions & 5 deletions dispatch-test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta04")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-beta05")

testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta04")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9")
testImplementation("com.rickbusarow.dispatch:dispatch-test:1.0.0-beta05")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.0")
}
```

Expand Down
Loading