Skip to content

Commit a66b9bd

Browse files
committed
feat: Add support for Kotlin 1.3.50
1 parent 15eabe2 commit a66b9bd

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To use the plugin, just apply the plugin in your `build.gradle`:
2222

2323
```groovy
2424
plugins {
25-
id 'nl.fabianm.kotlin.plugin.generated' version '1.3.3'
25+
id 'nl.fabianm.kotlin.plugin.generated' version '1.4.0'
2626
}
2727
```
2828

@@ -32,7 +32,8 @@ version you are using:
3232
| **Kotlin** | **Plugin** |
3333
|:----------:|:----------:|
3434
| 1.2.* | 1.0 |
35-
| 1.3.* | 1.3.3 |
35+
| 1.3.0+ | 1.3.3 |
36+
| 1.3.50+| 1.4.0 |
3637

3738
You can optionally configure the plugin as shown below:
3839

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616

1717
plugins {
18-
kotlin("jvm") version "1.3.31" apply false
18+
kotlin("jvm") version "1.3.50" apply false
1919
id("org.jlleitschuh.gradle.ktlint") version "8.2.0" apply false
2020
id("com.github.johnrengelman.shadow") version "5.0.0" apply false
2121
}
2222

2323
allprojects {
2424
group = "nl.fabianm.kotlin.plugin.generated"
25-
version = "1.3.3"
25+
version = "1.4.0"
2626

2727
extra["junitJupiterVersion"] = "5.4.2"
2828
extra["junitPlatformVersion"] = "1.4.2"

plugin-compiler/src/main/kotlin/nl/fabianm/kotlin/plugin/generated/compiler/GeneratedPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ fun <T> ProjectExtensionDescriptor<T>.registerExtensionAsFirst(project: Project,
109109
Extensions.getArea(project)
110110
.getExtensionPoint(extensionPointName)
111111
.let { it as ExtensionPointImpl }
112-
.registerExtension(extension, LoadingOrder.LAST)
112+
.registerExtension(extension, LoadingOrder.LAST) {}
113113
}

plugin-gradle/src/main/kotlin/nl/fabianm/kotlin/plugin/generated/gradle/GeneratedSubplugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class GeneratedKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
5050
companion object {
5151
private const val GENERATED_ARTIFACT_NAME = "plugin-gradle"
5252
private const val GENERATED_GROUP_ID = "nl.fabianm.kotlin.plugin.generated"
53-
private const val GENERATED_VERSION = "1.3.3"
53+
private const val GENERATED_VERSION = "1.4.0"
5454
private const val GENERATED_COMPILER_PLUGIN_ID = "nl.fabianm.kotlin.plugin.generated"
5555
private val ANNOTATION_ARG_NAME = "annotation"
5656
private val VISIBLE_ARG_NAME = "visible"

plugin-idea/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ tasks.jar {
5252
/* IntelliJ */
5353
intellij {
5454
pluginName = "kotlin-plugin-generated"
55-
version = "2019.1"
56-
setPlugins("gradle", "org.jetbrains.kotlin:1.3.31-release-IJ2019.1-1")
55+
version = "2019.2"
56+
setPlugins("gradle", "org.jetbrains.kotlin:1.3.50-release-IJ2019.2-1")
5757
}

plugin-idea/src/main/kotlin/nl/fabianm/kotlin/plugin/generated/idea/GeneratedImportHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ internal object GeneratedImportHandler {
5656
var isEnabled = false
5757
val oldPluginClasspaths = (commonArguments.pluginClasspaths ?: emptyArray()).filterTo(mutableListOf()) {
5858
val match = regex.matches(it) && validateJar(it, implementationTitle)
59-
logger.info("$it [match=$match]")
6059
if (match) {
60+
logger.info("$it [match=$match]")
6161
isEnabled = true
6262
}
6363
!match

0 commit comments

Comments
 (0)