Skip to content

Commit 64dc1b6

Browse files
committed
Cleanup some outdated Gradle setups
1 parent 277fe43 commit 64dc1b6

1 file changed

Lines changed: 5 additions & 29 deletions

File tree

build.gradle

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515
plugins {
1616
id 'com.github.johnrengelman.shadow' version '8.1.1'
17-
id "com.jfrog.artifactory" version "4.21.0"
17+
id "com.jfrog.artifactory" version "5.2.2"
1818
}
1919

2020
println """
@@ -54,6 +54,8 @@ allprojects {
5454
toolchain {
5555
languageVersion = JavaLanguageVersion.of(21)
5656
}
57+
withJavadocJar()
58+
withSourcesJar()
5759
}
5860

5961
tasks.test {
@@ -126,25 +128,6 @@ allprojects {
126128
}
127129
}
128130

129-
task sourcesJar(type: Jar, dependsOn: classes) {
130-
archiveClassifier.set('sources')
131-
from sourceSets.main.allSource
132-
}
133-
134-
task javadocJar(type: Jar, dependsOn: javadoc) {
135-
archiveClassifier.set('javadoc')
136-
from javadoc.destinationDir
137-
}
138-
139-
artifacts {
140-
archives shadowJar
141-
archives sourcesJar
142-
archives javadocJar
143-
}
144-
145-
build.dependsOn(sourcesJar)
146-
build.dependsOn(javadocJar)
147-
148131
jar {
149132
manifest {
150133
attributes("CraftBook-Version": pluginVersion)
@@ -181,17 +164,10 @@ allprojects {
181164
repoKey = project.version.contains("SNAPSHOT") ? 'libs-snapshot-local' : 'libs-release-local'
182165
username = "${artifactory_user}"
183166
password = "${artifactory_password}"
184-
maven = true
185-
186167
}
187-
}
188168

189-
resolve {
190-
repository {
191-
repoKey = 'repo'
192-
username = "${artifactory_user}"
193-
password = "${artifactory_password}"
194-
maven = true
169+
defaults {
170+
publications("mavenJava")
195171
}
196172
}
197173
}

0 commit comments

Comments
 (0)