Skip to content

Commit c6d25fa

Browse files
committed
Fixes GradleUp#668.
Remove gradle-publish-plugin from plugins dependencies. Update a number of other dependencies.
1 parent 969155a commit c6d25fa

File tree

3 files changed

+8
-44
lines changed

3 files changed

+8
-44
lines changed

build.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
10-
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0"
11-
classpath "com.gradle.publish:plugin-publish-plugin:0.14.0"
9+
classpath "com.gradle.publish:plugin-publish-plugin:0.16.0"
1210
classpath 'org.ajoberstar:gradle-git-publish:3.0.0'
13-
classpath "com.github.node-gradle:gradle-node-plugin:3.0.1"
11+
classpath "com.github.node-gradle:gradle-node-plugin:3.1.1"
1412
}
1513
}
1614

gradle/dependencies.gradle

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ dependencies {
22

33
shadow localGroovy()
44
shadow gradleApi()
5-
shadow 'org.codehaus.groovy:groovy-backports-compat23:3.0.7'
5+
shadow 'org.codehaus.groovy:groovy-backports-compat23:3.0.8'
66

7-
implementation "com.gradle.publish:plugin-publish-plugin:0.14.0"
87
implementation 'org.jdom:jdom2:2.0.6'
98
implementation 'org.ow2.asm:asm:9.2'
109
implementation 'org.ow2.asm:asm-commons:9.2'
11-
implementation 'commons-io:commons-io:2.8.0'
10+
implementation 'commons-io:commons-io:2.11.0'
1211
implementation 'org.apache.ant:ant:1.10.11'
13-
implementation 'org.codehaus.plexus:plexus-utils:3.3.0'
12+
implementation 'org.codehaus.plexus:plexus-utils:3.4.1'
1413
implementation "org.apache.logging.log4j:log4j-core:2.14.1"
1514
implementation('org.vafer:jdependency:2.7.0') {
1615
exclude group: 'org.ow2.asm'
@@ -22,7 +21,7 @@ dependencies {
2221
testImplementation 'org.spockframework:spock-junit4:2.0-groovy-3.0'
2322
testImplementation 'xmlunit:xmlunit:1.6'
2423
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
25-
testImplementation 'com.google.guava:guava:30.1.1-jre'
26-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
27-
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
24+
testImplementation 'com.google.guava:guava:31.0.1-jre'
25+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
26+
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.8.1'
2827
}

gradle/publish.gradle

-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'maven-publish'
2-
apply plugin: 'com.jfrog.artifactory'
32
apply plugin: "com.gradle.plugin-publish"
43

54
group = 'com.github.johnrengelman'
@@ -49,38 +48,6 @@ publishing {
4948
}
5049
}
5150

52-
artifactory {
53-
contextUrl = 'https://oss.jfrog.org/artifactory'
54-
publish {
55-
repository {
56-
repoKey = 'oss-snapshot-local'
57-
}
58-
defaults {
59-
publications 'pluginMaven'
60-
}
61-
}
62-
}
63-
64-
artifactoryPublish { task ->
65-
doFirst {
66-
if (!isSnapshot) {
67-
throw new GradleException('Cannot publish non-SNAPSHOT versions to OJO!')
68-
}
69-
}
70-
gradle.taskGraph.whenReady { taskGraph ->
71-
if (taskGraph.hasTask(task)) {
72-
project.artifactory {
73-
publish {
74-
repository {
75-
username = bintrayUser
76-
password = bintrayKey
77-
}
78-
}
79-
}
80-
}
81-
}
82-
}
83-
8451
// Workaround for configuring the artifact that publish-plugins uses: https://github.com/JLLeitschuh/ktlint-gradle/blob/master/plugin/build.gradle.kts
8552
// Need to move publishing configuration into afterEvaluate {}
8653
// to override changes done by "com.gradle.plugin-publish" plugin in afterEvaluate {} block

0 commit comments

Comments
 (0)