Skip to content

Commit 6ba0e8b

Browse files
committed
chore: move Gradle plugin versions to settings.gradle.kts
1 parent 2786a56 commit 6ba0e8b

File tree

4 files changed

+5
-36
lines changed

4 files changed

+5
-36
lines changed

build.gradle.kts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,12 @@ plugins {
2525
id("com.gradle.plugin-publish") apply false
2626
id("com.github.autostyle")
2727
id("org.jetbrains.gradle.plugin.idea-ext")
28-
id("com.github.ben-manes.versions")
2928
id("org.jetbrains.dokka")
3029
`embedded-kotlin`
3130
}
3231

3332
buildscript {
34-
val publishToCentral = (findProperty("publishToCentral") as? String)
35-
?.ifBlank { "true" }?.toBoolean() ?: true
36-
repositories {
37-
if (publishToCentral) {
38-
gradlePluginPortal()
39-
}
40-
}
4133
dependencies {
42-
if (publishToCentral) {
43-
val version = findProperty("released.version")
44-
classpath("com.github.vlsi.stage-vote-release:com.github.vlsi.stage-vote-release.gradle.plugin:$version")
45-
}
4634
classpath("org.ajoberstar.grgit:grgit-gradle:4.1.1")
4735
}
4836
}
@@ -54,8 +42,6 @@ val publishToCentral = (findProperty("publishToCentral") as? String)
5442
?.ifBlank { "true" }?.toBoolean() ?: true
5543

5644
if (publishToCentral) {
57-
apply(plugin = "com.github.vlsi.stage-vote-release")
58-
apply(from = "publish-central.gradle")
5945
}
6046

6147
allprojects {

gradle.properties

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,5 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=768m
1818
# See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
1919
# repository.apache.org does not yet support .sha256 and .sha512 checksums
2020
systemProp.org.gradle.internal.publish.checksums.insecure=true
21-
kotlin.code.style=official
2221

2322
project.version=1.90
24-
released.version=1.89
25-
26-
com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
27-
com.github.vlsi.checksum-dependency.version=1.88
28-
29-
# Plugins
30-
com.github.autostyle.version=3.2
31-
com.gradle.plugin-publish.version=1.2.0
32-
org.jetbrains.gradle.plugin.idea-ext.version=0.7
33-
com.github.ben-manes.versions.version=0.21.0
34-
org.jetbrains.dokka.version=1.4.32

plugins/ide-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
*/
1717

1818
dependencies {
19-
implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.10")
19+
implementation("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.1.10")
2020
}

settings.gradle.kts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,10 @@
1717

1818
pluginManagement {
1919
plugins {
20-
fun String.v() = extra["$this.version"].toString()
21-
fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id) version key.v()
22-
23-
idv("com.github.autostyle")
24-
idv("com.gradle.plugin-publish")
25-
idv("org.jetbrains.gradle.plugin.idea-ext")
26-
idv("com.github.ben-manes.versions")
27-
idv("org.jetbrains.dokka")
28-
idv("com.github.vlsi.stage-vote-release", "released")
20+
id("com.github.autostyle") version "3.2"
21+
id("com.gradle.plugin-publish") version "1.2.0"
22+
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.10"
23+
id("org.jetbrains.dokka") version "1.4.32"
2924
}
3025
}
3126

0 commit comments

Comments
 (0)