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 #229

Merged
merged 7 commits into from
May 25, 2021
Merged

dependency updates #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84e791e
Bump com.diffplug.spotless from 5.12.4 to 5.12.5 (#220)
dependabot[bot] May 15, 2021
ddf205a
introduce a BOM (#222)
RBusarow May 17, 2021
5363edf
Revert "introduce a BOM (#222)" (#224)
RBusarow May 17, 2021
4c3dd4b
Bump io.gitlab.arturbosch.detekt from 1.16.0 to 1.17.0 (#226)
dependabot[bot] May 17, 2021
5d420b9
Bump io.gitlab.arturbosch.detekt from 1.17.0 to 1.17.1 (#228)
dependabot[bot] May 21, 2021
446dc52
Merge branch 'main' into release/v1.0.0-rc01
RBusarow May 25, 2021
078b7b8
dependency updates
RBusarow May 25, 2021
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
7 changes: 2 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
classpath("com.android.tools.build:gradle:4.2.1")
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.16.1")
classpath("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.15.1")
classpath("org.jetbrains.kotlinx:kotlinx-knit:0.2.3")
}
Expand All @@ -37,15 +37,12 @@ plugins {
id("com.github.ben-manes.versions") version "0.38.0"
id("com.autonomousapps.dependency-analysis") version "0.73.0"
id("com.osacky.doctor") version "0.7.0"
id("io.gitlab.arturbosch.detekt") version "1.16.0"
id("io.gitlab.arturbosch.detekt") version "1.17.1"
kotlin("jvm")
id("org.jetbrains.dokka") version "1.4.10"
id("com.dorongold.task-tree") version "1.5"
id("com.diffplug.spotless") version "5.12.5"
base
// can be removed for Kotlin Gradle Plugin 1.5.10
// workaround for https://youtrack.jetbrains.com/issue/KT-46368#focus=Comments-27-4868598.0-0
id("dev.zacsweers.kgp-150-leak-patcher") version "1.1.0"
}

tasks.dokkaHtmlMultiModule.configure {
Expand Down
3 changes: 1 addition & 2 deletions buildSrc/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pluginManagement {
resolutionStrategy {
eachPlugin {
when {
requested.id.id.startsWith("org.jetbrains.kotlin") -> useVersion("1.5.0")
requested.id.id.startsWith("org.jetbrains.kotlin") -> useVersion("1.5.10")
}
}
}
Expand All @@ -38,7 +38,6 @@ dependencyResolutionManagement {
// dokka
includeGroup("org.jetbrains.dokka")
includeModule("org.jetbrains", "markdown")
// Detekt && dokka
includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
// https://youtrack.jetbrains.com/issue/IDEA-261387
includeModule("org.jetbrains.trove4j", "trove4j")
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Common.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fun Project.common() {
)
eachDependency {
when {
requested.group == "org.jetbrains.kotlin" -> useVersion("1.5.0")
requested.group == "org.jetbrains.kotlin" -> useVersion("1.5.10")
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions buildSrc/src/main/kotlin/DocsTasks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ fun File.updateLibraryVersions(): File {
"androidx.lifecycle:lifecycle-viewmodel:2.3.1".toDependencyMatcher(),
"androidx.test:runner:1.3.0".toDependencyMatcher(),
"androidx.test.espresso:espresso-core:3.3.0".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-api:1.16.0".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-cli:1.16.0".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-test:1.16.0".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-api:1.17.1".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-cli:1.17.1".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1".toDependencyMatcher(),
"io.gitlab.arturbosch.detekt:detekt-test:1.17.1".toDependencyMatcher(),
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0".toDependencyMatcher(),
"org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0".toDependencyMatcher(),
"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0".toDependencyMatcher(),
Expand All @@ -174,9 +174,9 @@ fun File.updateLibraryVersions(): File {
"com.rickbusarow.hermit:hermit-junit5:0.9.2".toDependencyMatcher(),
"com.rickbusarow.hermit:hermit-mockk:0.9.2".toDependencyMatcher(),
"com.rickbusarow.hermit:hermit-coroutines:0.9.2".toDependencyMatcher(),
"io.kotest:kotest-assertions-core-jvm:4.4.3".toDependencyMatcher(),
"io.kotest:kotest-property-jvm:4.4.3".toDependencyMatcher(),
"io.kotest:kotest-runner-junit5-jvm:4.4.3".toDependencyMatcher()
"io.kotest:kotest-assertions-core-jvm:4.6.0".toDependencyMatcher(),
"io.kotest:kotest-property-jvm:4.6.0".toDependencyMatcher(),
"io.kotest:kotest-runner-junit5-jvm:4.6.0".toDependencyMatcher()
)

forEachLine { originalLine ->
Expand Down
2 changes: 1 addition & 1 deletion dispatch-detekt/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ In root project-level `build.gradle` or `build.gradle.kts`:
``` kotlin
allprojects {
dependencies {
detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.16.0")
detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.17.1")

implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
detektPlugins("com.rickbusarow.dispatch:dispatch-detekt")
Expand Down
4 changes: 2 additions & 2 deletions docs/dispatch-android-espresso.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-core")

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

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle-extensions")

Expand Down
4 changes: 2 additions & 2 deletions docs/dispatch-android-lifecycle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-android-lifecycle")
implementation("androidx.lifecycle:lifecycle-common:2.3.1")
Expand Down
4 changes: 2 additions & 2 deletions docs/dispatch-android-viewmodel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-android-viewmodel")
}
Expand Down
4 changes: 2 additions & 2 deletions docs/dispatch-core.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ repositories {

dependencies {

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-core")
}
Expand Down
2 changes: 1 addition & 1 deletion docs/dispatch-detekt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ In root project-level `build.gradle` or `build.gradle.kts`:
``` kotlin
allprojects {
dependencies {
detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.16.0")
detekt("io.gitlab.arturbosch.detekt:detekt-cli:1.17.1")

implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
detektPlugins("com.rickbusarow.dispatch:dispatch-detekt")
Expand Down
12 changes: 6 additions & 6 deletions docs/dispatch-test-junit4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-core")

// the junit4 artifact also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
}
```

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

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-RC01")

// the junit4 and junit5 artifacts also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-RC01")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-RC01")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
}
```

Expand Down
12 changes: 6 additions & 6 deletions docs/dispatch-test-junit5.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.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-core")

// the junit5 artifact also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
}
```
Expand All @@ -127,16 +127,16 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation("com.rickbusarow.dispatch:dispatch-core:1.0.0-RC01")

// the junit4 and junit5 artifacts also provides the dispatch-test artifact
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit4:1.0.0-RC01")
testImplementation("com.rickbusarow.dispatch:dispatch-test-junit5:1.0.0-RC01")
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
testImplementation("org.junit.vintage:junit-vintage-engine:5.7.1")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
}
```

Expand Down
6 changes: 3 additions & 3 deletions docs/dispatch-test.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ repositories {
dependencies {

// core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
implementation("com.rickbusarow.dispatch:dispatch-core")

testImplementation("com.rickbusarow.dispatch:dispatch-test")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
}
```

Expand Down
6 changes: 3 additions & 3 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@ dependencies {
*/

// core coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")

// a BOM ensures that all artifacts used from the library are of the same version
implementation(platform("com.rickbusarow.dispatch:dispatch-bom:1.0.0-RC01"))
Expand All @@ -382,7 +382,7 @@ dependencies {
*/

// core coroutines-test
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
// you only need this if you don't have the -junit4 or -junit5 artifacts
testImplementation("com.rickbusarow.dispatch:dispatch-test")
// CoroutineTestRule and :dispatch-test
Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ compileSdk = "30"
coroutines = "1.5.0"
dependencyAnalysis = "0.63.0"
dispatch = "1.0.0-beta09"
detekt = "1.16.0"
detekt = "1.17.1"
dokka = "1.4.10"
gradleDoctor = "0.7.0"
groovy = "3.0.8"
hermit = "0.9.3"
jUnit = "5.7.1"
jUnit = "5.7.2"
knit = "0.2.3"
kotest = "4.5.0"
kotlin = "1.5.0"
kotest = "4.6.0"
kotlin = "1.5.10"
kotlinter = "3.4.0"
mavenPublish = "0.13.0"
minSdk = "23"
Expand All @@ -31,13 +31,13 @@ versionName = "1.0.0-RC01"
[libraries]

androidx-activity = "androidx.activity:activity-ktx:1.2.3"
androidx-appcompat = "androidx.appcompat:appcompat:1.2.0"
androidx-appcompat = "androidx.appcompat:appcompat:1.3.0"
androidx-constraintLayout = "androidx.constraintlayout:constraintlayout:2.0.4"
androidx-coreKtx = "androidx.core:core-ktx:1.3.2"
androidx-coreKtx = "androidx.core:core-ktx:1.5.0"

androidx-fragment-core = "androidx.fragment:fragment:1.3.3"
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.3.3"
androidx-fragment-testing = "androidx.fragment:fragment-testing:1.3.3"
androidx-fragment-core = "androidx.fragment:fragment:1.3.4"
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.3.4"
androidx-fragment-testing = "androidx.fragment:fragment-testing:1.3.4"

androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.3.1"
androidx-lifecycle-extensions = "androidx.lifecycle:lifecycle-extensions:2.3.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pluginManagement {
resolutionStrategy {
eachPlugin {
when {
requested.id.id.startsWith("org.jetbrains.kotlin") -> useVersion("1.5.0")
requested.id.id.startsWith("org.jetbrains.kotlin") -> useVersion("1.5.10")
}
}
}
Expand Down