Skip to content

Commit

Permalink
Update Gradle wrapper to 8.11.1 and remove deprecated JavaPluginConve…
Browse files Browse the repository at this point in the history
…ntion references
  • Loading branch information
hnhv committed Dec 18, 2024
1 parent 010dbbb commit 44f8532
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 34 deletions.
45 changes: 12 additions & 33 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@ repositories {
group = "com.pusher"
version = "1.3.3"
description = "Pusher HTTP Client"
sourceCompatibility = "1.8"
targetCompatibility = "1.8"

ext.sharedManifest = manifest {
attributes(
'Created-By': 'Pusher',
'Implementation-Vendor': 'Pusher',
'Implementation-Title': 'Pusher HTTP Java',
'Implementation-Version': version
)
java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
withSourcesJar()
withJavadocJar()
}

dependencies {
Expand All @@ -62,33 +58,16 @@ javadoc {

jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
manifest = project.manifest {
from sharedManifest
manifest {
attributes(
'Created-By': 'Pusher',
'Implementation-Vendor': 'Pusher',
'Implementation-Title': 'Pusher HTTP Java',
'Implementation-Version': version
)
}
}

task sourcesJar(type: Jar, dependsOn: classes) {
archiveClassifier.set('sources')
from sourceSets.main.allSource
}
assemble.dependsOn sourcesJar


task javadocJar(type: Jar, dependsOn: javadoc) {
archiveClassifier.set('javadoc')
from javadoc.destinationDir
}
assemble.dependsOn javadocJar

artifacts {
archives jar, sourcesJar, javadocJar
}

java {
withSourcesJar()
withJavadocJar()
}

publishing {
publications {
mavenJava(MavenPublication) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 44f8532

Please sign in to comment.