Skip to content

Commit 09ebffb

Browse files
committed
Update plugins
Update IntelliJ plugin to latest 1.1.4 Update Download plugin to latest 4.1.2 Update Gradle to 6.9.1
1 parent 34db62f commit 09ebffb

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

build.gradle

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import com.hierynomus.gradle.license.tasks.LicenseCheck
22
import com.hierynomus.gradle.license.tasks.LicenseFormat
33

44
plugins {
5-
id "org.jetbrains.intellij" version "0.4.21"
5+
id "org.jetbrains.intellij" version "1.1.4"
66
id "com.github.hierynomus.license" version "0.14.0"
7-
id "de.undercouch.download" version "4.0.4"
7+
id "de.undercouch.download" version "4.1.2"
88
id 'org.jetbrains.kotlin.jvm' version '1.4.31'
99
}
1010

@@ -26,26 +26,18 @@ targetCompatibility = 1.8
2626
repositories {
2727
mavenLocal()
2828
mavenCentral()
29-
maven {
30-
url 'https://dl.bintray.com/jetbrains/intellij-plugin-service'
31-
}
3229
}
3330

3431
intellij {
35-
version System.getenv().getOrDefault('IDEA_VERSION', ideaVersion)
36-
type ideaType
37-
downloadSources Boolean.valueOf(sources)
38-
sameSinceUntilBuild Boolean.valueOf(isEAP)
39-
alternativeIdePath idePath
40-
updateSinceUntilBuild false
41-
pluginName 'MapStruct-Intellij-Plugin'
32+
version = System.getenv().getOrDefault('IDEA_VERSION', ideaVersion)
33+
type = ideaType
34+
downloadSources = Boolean.valueOf(sources)
35+
sameSinceUntilBuild = Boolean.valueOf(isEAP)
36+
updateSinceUntilBuild = false
37+
pluginName = 'MapStruct-Intellij-Plugin'
4238
// The properties plugin is needed because Kotlin uses it
4339
// and for some reason plugins does not transitively pull itx
44-
if ( !(version.startsWith('2018') || version.startsWith('2019.1'))) {
45-
plugins = ['java', 'Kotlin', 'properties']
46-
} else {
47-
plugins = ['Kotlin', 'properties']
48-
}
40+
plugins = ['java', 'Kotlin', 'properties']
4941
}
5042

5143
compileKotlin {

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ publishPluginId =
1616
publishUsername =
1717
publishPassword =
1818
publishChannel =
19-
20-
idePath =
Lines changed: 1 addition & 1 deletion
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.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)