Skip to content

Commit 78f2192

Browse files
authored
Merge pull request #687 from TacoTheDank/gradle7
Upgrade to Gradle 7.1.1
2 parents 71b9fd0 + 4a7c172 commit 78f2192

7 files changed

Lines changed: 51 additions & 49 deletions

File tree

build.gradle

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
allprojects {
22
apply plugin: 'java-library'
3-
apply plugin: 'maven'
3+
apply plugin: 'maven-publish'
44

55
compileJava.options.encoding = 'UTF-8'
66
compileTestJava.options.encoding = 'UTF-8'
@@ -12,9 +12,25 @@ allprojects {
1212
group 'com.github.TeamNewPipe'
1313

1414
repositories {
15-
jcenter()
15+
mavenCentral()
1616
maven { url "https://jitpack.io" }
1717
}
18+
19+
afterEvaluate {
20+
publishing {
21+
publications {
22+
mavenJava(MavenPublication) {
23+
from components.java
24+
}
25+
}
26+
}
27+
}
28+
29+
ext {
30+
nanojsonVersion = "1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
31+
spotbugsVersion = "4.2.3"
32+
junitVersion = "4.13.2"
33+
}
1834
}
1935

2036
dependencies {
@@ -24,7 +40,7 @@ dependencies {
2440

2541
subprojects {
2642
task sourcesJar(type: Jar, dependsOn: classes) {
27-
classifier = 'sources'
43+
archiveClassifier.set('sources')
2844
from sourceSets.main.allSource
2945
}
3046

@@ -53,7 +69,7 @@ task aggregatedJavadocs(type: Javadoc, group: 'Documentation') {
5369
"apiNote:a:API Note:",
5470
"implSpec:a:Implementation Requirements:",
5571
"implNote:a:Implementation Note:"
56-
]
72+
]
5773

5874
subprojects.each { project ->
5975
project.tasks.withType(Javadoc).each { javadocTask ->

extractor/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ test {
88
dependencies {
99
implementation project(':timeago-parser')
1010

11-
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
11+
implementation "com.github.TeamNewPipe:nanojson:$nanojsonVersion"
1212
implementation 'org.jsoup:jsoup:1.13.1'
1313
implementation 'org.mozilla:rhino:1.7.13'
14-
implementation 'com.github.spotbugs:spotbugs-annotations:4.2.3'
14+
implementation "com.github.spotbugs:spotbugs-annotations:$spotbugsVersion"
1515
implementation 'org.nibor.autolink:autolink:0.10.0'
1616

17-
testImplementation 'junit:junit:4.13.2'
17+
testImplementation "junit:junit:$junitVersion"
1818
testImplementation "com.squareup.okhttp3:okhttp:3.12.13"
1919
testImplementation 'com.google.code.gson:gson:2.8.7'
2020
}

gradle/wrapper/gradle-wrapper.jar

3.83 KB
Binary file not shown.
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.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 7 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

timeago-parser/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
testImplementation 'junit:junit:4.13.1'
2+
testImplementation "junit:junit:$junitVersion"
33

4-
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
5-
implementation 'com.github.spotbugs:spotbugs-annotations:4.2.3'
4+
implementation "com.github.TeamNewPipe:nanojson:$nanojsonVersion"
5+
implementation "com.github.spotbugs:spotbugs-annotations:$spotbugsVersion"
66
}

0 commit comments

Comments
 (0)