Skip to content

Commit 49f62c9

Browse files
committed
Main dependencies updated:
- gradle wrapper to 8.1 - kotlin to 1.9.20 - mockito-core to version 5.7.0 - few other related changes
1 parent ccbb768 commit 49f62c9

File tree

5 files changed

+41
-34
lines changed

5 files changed

+41
-34
lines changed

gradle/publishing.gradle

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
apply plugin: 'maven-publish'
33

44
task javadocJar(type: Jar, dependsOn: javadoc) {
5-
classifier = 'javadoc'
5+
archiveClassifier = 'javadoc'
66
from 'build/javadoc'
77
}
88

99
task sourceJar(type: Jar) {
10+
archiveClassifier = "sources"
1011
from sourceSets.main.allSource
1112
}
1213

@@ -17,10 +18,7 @@ publishing {
1718

1819
from components.java
1920

20-
artifact sourceJar {
21-
classifier "sources"
22-
}
23-
21+
artifact sourceJar
2422
artifact javadocJar
2523

2624
pom.withXml {
@@ -67,4 +65,4 @@ signing {
6765
useInMemoryPgpKeys(System.getenv("PGP_KEY"), System.getenv("PGP_PWD"))
6866
sign publishing.publications.javaLibrary
6967
}
70-
}
68+
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

mockito-kotlin/build.gradle

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
apply plugin: 'kotlin'
45
apply from: '../gradle/publishing.gradle'
56
apply plugin: 'org.jetbrains.dokka'
67

78
buildscript {
8-
ext.kotlin_version = "1.4.20"
9+
ext.kotlin_version = "1.9.20"
910

1011
repositories {
1112
mavenCentral()
1213
}
1314

1415
dependencies {
1516
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
16-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
17+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
1718
}
1819
}
1920

@@ -25,33 +26,35 @@ dependencies {
2526
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
2627
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
2728

28-
compile "org.mockito:mockito-core:5.3.1"
29+
implementation "org.mockito:mockito-core:5.7.0"
2930

30-
testCompile 'junit:junit:4.13.2'
31-
testCompile 'com.nhaarman:expect.kt:1.0.1'
31+
testImplementation 'junit:junit:4.13.2'
32+
testImplementation 'com.nhaarman:expect.kt:1.0.1'
3233

33-
testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
34-
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
35-
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
34+
testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
35+
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
36+
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
3637

3738
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0"
3839
}
3940

40-
dokka {
41-
outputFormat = 'html'
42-
outputDirectory = "$buildDir/javadoc"
41+
dokkaHtml.configure {
42+
outputDirectory.set(file("$buildDir/javadoc"))
4343

44-
linkMapping {
45-
dir = "src/main/kotlin"
46-
url = "https://github.com/nhaarman/mockito-kotlin/tree/master/mockito-kotlin/src/main/kotlin"
47-
suffix = "#L"
44+
dokkaSourceSets {
45+
named("main") {
46+
localDirectory.set(file("src/main/kotlin"))
47+
remoteUrl.set(new URL("https://github.com/nhaarman/mockito-kotlin/tree/master/mockito-kotlin/src/main/kotlin"))
48+
remoteLineSuffix.set("#L")
49+
}
4850
}
4951
}
5052

5153
tasks.withType(KotlinCompile).configureEach {
52-
kotlinOptions {
53-
jvmTarget = JavaVersion.VERSION_11
54+
compilerOptions {
55+
jvmTarget.set(JvmTarget.JVM_11)
56+
targetCompatibility = "11"
5457
}
5558
}
5659

57-
javadoc.dependsOn dokka
60+
javadoc.dependsOn dokkaHtml

mockito-kotlin/src/main/kotlin/org/mockito/kotlin/Mocking.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,4 @@ inline fun <reified T : Any> mock(s: String): T = mock(name = s)
208208

209209
@Suppress("DeprecatedCallableAddReplaceWith")
210210
@Deprecated("Use mock() with optional arguments instead.", level = ERROR)
211-
inline fun <reified T : Any> mock(s: MockSettings): T = Mockito.mock(T::class.java, s)!!
211+
inline fun <reified T : Any> mock(s: MockSettings): T = Mockito.mock(T::class.java, s)!!

tests/build.gradle

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
buildscript {
4-
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.4.20'
5+
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.9.20'
56
println "$project uses Kotlin $kotlin_version"
67

78
repositories {
@@ -19,18 +20,23 @@ repositories {
1920
mavenCentral()
2021
}
2122

23+
tasks.named('compileTestKotlin') {
24+
dependsOn ':mockito-kotlin:jar'
25+
}
26+
2227
dependencies {
23-
compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${version}.jar")
28+
implementation files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${version}.jar")
2429

25-
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
26-
compile "org.mockito:mockito-core:5.3.1"
30+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
31+
implementation "org.mockito:mockito-core:5.7.0"
2732

28-
testCompile 'junit:junit:4.13.2'
29-
testCompile "com.nhaarman:expect.kt:1.0.1"
33+
testImplementation 'junit:junit:4.13.2'
34+
testImplementation "com.nhaarman:expect.kt:1.0.1"
3035
}
3136

3237
tasks.withType(KotlinCompile).configureEach {
33-
kotlinOptions {
34-
jvmTarget = JavaVersion.VERSION_11
38+
compilerOptions {
39+
jvmTarget.set(JvmTarget.JVM_11)
40+
targetCompatibility = "11"
3541
}
3642
}

0 commit comments

Comments
 (0)