Skip to content

Upgrading Gradle to 6.9.2, Kotlin to 1.4.20, junit to 4.13.2 and mockito to 4.4.0 #458

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

Merged
TimvdLippe merged 4 commits into from
Apr 22, 2022
Merged

Upgrading Gradle to 6.9.2, Kotlin to 1.4.20, junit to 4.13.2 and mockito to 4.4.0 #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aab37d
Upgrading to Gradle 6.9.2
vetler Apr 20, 2022
30c36f8
Upgrading to Kotlin 1.4.20, most recent version supported by Gradle 6…
vetler Apr 20, 2022
53ac933
Upgrade to Mockito 4.5.1
vetler Apr 22, 2022
875a06a
Upgrade to junit 4.13.2
vetler Apr 22, 2022
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
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
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions mockito-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply from: '../gradle/publishing.gradle'
apply plugin: 'org.jetbrains.dokka'

buildscript {
ext.kotlin_version = "1.3.50"
ext.kotlin_version = "1.4.20"

repositories {
mavenCentral()
Expand All @@ -23,9 +23,9 @@ dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'

compile "org.mockito:mockito-core:4.0.0"
compile "org.mockito:mockito-core:4.5.1"

testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.13.2'
testCompile 'com.nhaarman:expect.kt:1.0.1'

testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
Expand Down
6 changes: 3 additions & 3 deletions tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.3.50'
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.4.20'
println "$project uses Kotlin $kotlin_version"

repositories {
Expand All @@ -21,8 +21,8 @@ dependencies {
compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${version}.jar")

compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.mockito:mockito-core:4.0.0"
compile "org.mockito:mockito-core:4.5.1"

testCompile "junit:junit:4.12"
testCompile 'junit:junit:4.13.2'
testCompile "com.nhaarman:expect.kt:1.0.1"
}