Skip to content

Commit 6e01f9a

Browse files
committed
Upgrade to Gradle 7.3.3 and bump plugin versions
Drop the bintray publishing stuff, since jcenter is dead. Remove the unused ImportUtils prototype, since it requires Oracle JVM.
1 parent 4948086 commit 6e01f9a

File tree

9 files changed

+217
-273
lines changed

9 files changed

+217
-273
lines changed

build.gradle

Lines changed: 6 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
plugins {
2-
id 'com.github.johnrengelman.shadow' version '2.0.4'
3-
id "com.jfrog.bintray" version "1.8.5"
2+
id 'com.github.johnrengelman.shadow' version '7.1.2'
43
}
54

65
subprojects { subproject ->
76
apply plugin: 'java'
87
apply plugin: 'maven-publish'
9-
apply plugin: 'com.jfrog.bintray'
108
apply plugin: 'com.github.johnrengelman.shadow'
119

1210
group = "com.github.therapi"
13-
version = "0.12.0"
11+
version = "0.13.0-SNAPSHOT"
1412

1513
repositories {
16-
jcenter()
14+
mavenCentral()
1715
}
1816

1917
dependencies {
20-
compile 'com.eclipsesource.minimal-json:minimal-json:0.9.5'
21-
testCompile 'junit:junit:4.12'
18+
implementation 'com.eclipsesource.minimal-json:minimal-json:0.9.5'
19+
testImplementation 'junit:junit:4.13.2'
2220
}
2321

2422
sourceCompatibility = 1.7
2523
targetCompatibility = 1.7
2624

2725
shadowJar {
28-
classifier = null
26+
archiveClassifier.set('')
2927
mergeServiceFiles()
3028
relocate 'com.eclipsesource', 'com.github.therapi.runtimejavadoc.repack.com.eclipsesource'
3129
}
@@ -68,59 +66,4 @@ subprojects { subproject ->
6866
dependsOn(publishToMavenLocal)
6967
}
7068

71-
bintrayUpload.doFirst {
72-
if (version.contains("SNAPSHOT")) {
73-
throw new RuntimeException("Must not upload snapshots to bintray (current version is ${version}) -- create and tag a release version first!")
74-
}
75-
}
76-
77-
bintray {
78-
if (project.hasProperty('bintrayUsername')) {
79-
user = project.bintrayUsername
80-
}
81-
82-
if (project.hasProperty('bintrayApiKey')) {
83-
key = project.bintrayApiKey
84-
}
85-
86-
publications = ['mavenJava'] // When uploading Maven-based publication files
87-
88-
dryRun = false //false //Whether to run this as dry-run, without deploying
89-
publish = false //true //If version should be auto published after an upload
90-
91-
pkg {
92-
repo = 'maven'
93-
// userOrg = 'myorg' //An optional organization name when the repo belongs to one of the user's orgs
94-
name = subproject.name
95-
desc = subproject.description
96-
websiteUrl = "https://github.com/dnault/${project.ext.gitProjectName}"
97-
issueTrackerUrl = "https://github.com/dnault/${project.ext.gitProjectName}/issues"
98-
vcsUrl = "https://github.com/dnault/${project.ext.gitProjectName}.git"
99-
licenses = ['Apache-2.0']
100-
labels = ['runtime', 'javadoc']
101-
publicDownloadNumbers = false//true
102-
//attributes= ['a': ['ay1', 'ay2'], 'b': ['bee'], c: 'cee'] //Optional package-level attributes
103-
//Optional version descriptor
104-
version {
105-
name = project.version //'1.3-Final' //Bintray logical version name
106-
//desc = 'optional, version-specific description'
107-
released = new Date()
108-
//'optional, date of the version release' //2 possible values: date in the format of 'yyyy-MM-dd'T'HH:mm:ss.SSSZZ' OR a java.util.Date instance
109-
vcsTag = project.version //'1.3.0'
110-
// attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin'] //Optional version-level attributes
111-
gpg {
112-
// sign = true //Determines whether to GPG sign the files. The default is false
113-
// passphrase = 'passphrase' //Optional. The passphrase for GPG signing'
114-
}
115-
mavenCentralSync {
116-
sync = false
117-
//true //Optional (true by default). Determines whether to sync the version to Maven Central.
118-
user = 'userToken' //OSS user token
119-
password = 'paasword' //OSS user password
120-
close = '0'
121-
//'1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
122-
}
123-
}
124-
}
125-
}
12669
}

gradle/wrapper/gradle-wrapper.jar

7.09 KB
Binary file not shown.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#Tue Sep 01 18:40:17 PDT 2015
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
7-

0 commit comments

Comments
 (0)