Skip to content

Commit 2345898

Browse files
Bump kotlin_version from 1.4.10 to 1.5.31 (#85)
* Bump kotlin_version from 1.4.10 to 1.5.31 Bumps `kotlin_version` from 1.4.10 to 1.5.31. Updates `kotlin-gradle-plugin` from 1.4.10 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib` from 1.4.10 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix issue with kotlin 1.5 and jacoco Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chris Mitchell <chrism@dropbox.com>
1 parent 71d1147 commit 2345898

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

affectedmoduledetector/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ java {
1515
targetCompatibility = JavaVersion.VERSION_1_7
1616
}
1717

18+
jacoco {
19+
toolVersion = "0.8.7"
20+
}
21+
1822
dependencies {
1923
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
2024
testImplementation("junit:junit:4.13.2")

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPluginTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.dropbox.affectedmoduledetector
22

33
import com.google.common.truth.Truth.assertThat
4-
import junit.framework.Assert.fail
54
import org.gradle.api.Project
5+
import org.gradle.api.internal.plugins.PluginApplicationException
66
import org.gradle.testfixtures.ProjectBuilder
77
import org.junit.Before
88
import org.junit.Rule
99
import org.junit.Test
1010
import org.junit.rules.TemporaryFolder
11+
import java.lang.IllegalStateException
1112

1213
class AffectedModuleDetectorPluginTest {
1314

@@ -39,8 +40,8 @@ class AffectedModuleDetectorPluginTest {
3940
try {
4041
// WHEN
4142
childProject.pluginManager.apply(AffectedModuleDetectorPlugin::class.java)
42-
fail("Expected exception not thrown")
43-
} catch (e: Exception) {
43+
throw IllegalStateException("Expected to throw exception")
44+
} catch (e: PluginApplicationException) {
4445
// THEN
4546
assertThat(e.message).isEqualTo("Failed to apply plugin [class 'com.dropbox.affectedmoduledetector.AffectedModuleDetectorPlugin']")
4647
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.4.10"
3+
ext.kotlin_version = "1.5.31"
44
repositories {
55
google()
66
jcenter()

0 commit comments

Comments
 (0)