From ff66adf3ee46a184212f50e398dc536540e360a2 Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Fri, 28 Feb 2025 16:26:19 +0530 Subject: [PATCH 01/10] version update --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1826ddb4..df1e95e6 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ dependencies { compile 'com.squareup.retrofit2:converter-jackson:2.2.0' compile 'com.squareup.retrofit2:retrofit:2.2.0' - compile 'com.squareup.okhttp3:logging-interceptor:3.7.0' + compile 'com.squareup.okhttp3:logging-interceptor:4.12.0' compile 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' compile 'org.glassfish.jaxb:jaxb-runtime:2.3.2' compile 'com.auth0:java-jwt:3.10.2' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23d347a8..ee459fe8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8155c597..b934ee21 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ com.squareup.okhttp3 logging-interceptor - 3.7.0 + 4.12.0 compile From 41efb8128e5e7aba73550806eaead4c1f35d5a23 Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Fri, 28 Feb 2025 16:32:49 +0530 Subject: [PATCH 02/10] version changes --- CHANGELOG.md | 4 ++++ README.md | 2 +- pom.properties | 2 +- src/main/resources/com/plivo/api/version.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f596298..ca032821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Change Log +## [5.45.6](https://github.com/plivo/plivo-java/tree/v5.45.5) (2025-02-25) +**Fix - Upgraded version for okhttp3 package.** +- Upgraded version for okhttp3 package . + ## [5.45.5](https://github.com/plivo/plivo-java/tree/v5.45.5) (2025-02-25) **Enhancement - Supporting parameter_name in WhatsApp Template .** - Supporting parameter_name in WhatsApp Template . diff --git a/README.md b/README.md index 1461c707..22eecefc 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Plivo Java SDK makes it simpler to integrate communications into your Java a ### To Install Stable release -You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.45.5/plivo-java-5.45.5.jar). +You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.45.6/plivo-java-5.45.5.jar). If you are using Maven, use the following XML to include the Plivo SDK as a dependency. diff --git a/pom.properties b/pom.properties index ccc36ab0..feaca3f1 100644 --- a/pom.properties +++ b/pom.properties @@ -1,6 +1,6 @@ # Written manually. -version=5.45.5 +version=5.45.6 groupId=com.plivo artifactId=plivo-java diff --git a/src/main/resources/com/plivo/api/version.txt b/src/main/resources/com/plivo/api/version.txt index 0315a169..3c482d53 100644 --- a/src/main/resources/com/plivo/api/version.txt +++ b/src/main/resources/com/plivo/api/version.txt @@ -1 +1 @@ -5.45.5 +5.45.6 From 7eeb36adc67973417bc5760c7614f9f21e1c01cb Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Fri, 28 Feb 2025 17:36:11 +0530 Subject: [PATCH 03/10] version compatible --- build.gradle | 302 ++++++++++++--------------- config/checkstyle/checkstyle.xml | 340 +++++++++++++++---------------- 2 files changed, 299 insertions(+), 343 deletions(-) diff --git a/build.gradle b/build.gradle index df1e95e6..a136ebd7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,199 +1,159 @@ -group 'com.plivo' -version new File("${projectDir}/src/main/resources/com/plivo/api/version.txt").readLines().get(0) -ext["mavenUserName"] = System.getenv("MAVEN_USERNAME") ?: "" -ext["mavenPassword"] = System.getenv("MAVEN_PASSWORD") ?: "" - - -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.0' - } - +plugins { + id 'java-library' + id 'maven-publish' + id 'signing' + id 'checkstyle' + id 'idea' + id 'eclipse' + id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'io.codearte.nexus-staging' version '0.30.0' } -buildscript { - repositories { - maven { - url "https://plugins.gradle.org/m2/" - } - } - dependencies { - classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.12.0" - } -} -apply plugin: 'com.github.johnrengelman.shadow' -apply plugin: 'java' -apply plugin: 'checkstyle' -apply plugin: 'idea' -apply plugin: 'eclipse' -apply plugin: 'maven' -apply plugin: 'maven-publish' -apply plugin: 'signing' -apply plugin: 'io.codearte.nexus-staging' +group = 'com.plivo' +version = new File("${projectDir}/src/main/resources/com/plivo/api/version.txt").readLines().get(0) -nexusStaging { - numberOfRetries = 60 - delayBetweenRetriesInMillis = 40000 +repositories { + mavenCentral() + gradlePluginPortal() } -repositories { - mavenCentral() +java { + withJavadocJar() + withSourcesJar() + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } -tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" - options.fork = true; options.forkOptions.executable = 'javac' - options.compilerArgs << "-XDignore.symbol.file=true" +tasks.withType(JavaCompile).configureEach { + options.compilerArgs << "-Xlint:unchecked" + options.compilerArgs << "-XDignore.symbol.file=true" } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'com.squareup.okhttp', name: 'mockwebserver', version: '2.7.5' - - compile 'com.squareup.retrofit2:converter-jackson:2.2.0' - compile 'com.squareup.retrofit2:retrofit:2.2.0' - compile 'com.squareup.okhttp3:logging-interceptor:4.12.0' - compile 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' - compile 'org.glassfish.jaxb:jaxb-runtime:2.3.2' - compile 'com.auth0:java-jwt:3.10.2' + testImplementation(platform('org.junit:junit-bom:5.10.0')) + testImplementation('org.junit.jupiter:junit-jupiter') + testRuntimeOnly('org.junit.platform:junit-platform-launcher') + + testImplementation 'com.squareup.okhttp:mockwebserver:2.7.5' + + implementation 'com.squareup.retrofit2:converter-jackson:2.2.0' + implementation 'com.squareup.retrofit2:retrofit:2.2.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2' + implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.2' + implementation 'com.auth0:java-jwt:3.10.2' +} + +checkstyle { + toolVersion = '10.12.5' + configFile = file("${projectDir}/config/checkstyle/checkstyle.xml") + configProperties = [ + 'checkstyle.cache.file': "${buildDir}/checkstyle.cache" + ] + showViolations = true + sourceSets = [sourceSets.main, sourceSets.test] + ignoreFailures = false +} + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } + ignoreFailures = false } javadoc { - title "Plivo Java SDK" - options.linkSource = true + title = "Plivo Java SDK" + options.linkSource = true } jar { - manifest { - attributes( - "Created-By": 'Plivo', - 'Implementation-Vendor': 'Plivo', - 'Implementation-Title': 'Plivo Java SDK', - 'Implementation-Version': version - ) - } -} - -task sourceJar(type: Jar, dependsOn: classes) { - classifier 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir + manifest { + attributes( + "Created-By": 'Plivo', + 'Implementation-Vendor': 'Plivo', + 'Implementation-Title': 'Plivo Java SDK', + 'Implementation-Version': version + ) + } } -task fatJar(type: Jar) { - manifest { - attributes 'Implementation-Title': 'Plivo fat jar', - 'Implementation-Version': version - } - archiveName = "plivo-java-${version}-jar-with-dependencies.jar" - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } - with jar - print("Created fatjar: ${destinationDir}/${archiveName}") +shadowJar { + archiveClassifier.set('all') + archiveBaseName.set("plivo-java-${version}-jar-with-dependencies") } -task createPom { - doLast - { - pom { - project { - name 'plivo-java' - packaging 'jar' - description 'A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML' - - licenses { - license { - name 'The MIT License' - url 'https://github.com/plivo/plivo-java/blob/4.0/LICENSE.txt' - distribution 'repo' - } - } - - developers { - developer { - name 'The Plivo SDKs Team' - email 'sdks@plivo.com' - organization 'Plivo, Inc.' - organizationUrl 'https://plivo.com' +nexusStaging { + numberOfRetries = 60 + delayBetweenRetriesInMillis = 40000 +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + name = 'plivo-java' + packaging = 'jar' + artifactId = 'plivo-java' + description = 'A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML' + url = 'https://github.com/plivo/plivo-java/' + + scm { + connection = 'scm:git:git@github.com:plivo/plivo-java.git' + developerConnection = 'scm:git:git@github.com:plivo/plivo-java.git' + url = 'git@github.com:plivo/plivo-java.git' + } + + licenses { + license { + name = 'The MIT License' + url = 'https://github.com/plivo/plivo-java/blob/4.0/LICENSE.txt' + } + } + + organization { + name = 'Plivo' + url = 'https://api-reference.plivo.com/latest/net/introduction/overview' + } + + issueManagement { + system = 'GitHub' + url = 'https://github.com/plivo/plivo-java/issues' + } + + developers { + developer { + name = 'The Plivo SDKs Team' + email = 'sdks@plivo.com' + organization = 'Plivo, Inc.' + organizationUrl = 'https://plivo.com' + } + } + } } - } - - scm { - url 'git@github.com:plivo/plivo-java.git' - connection 'scm:git:git@github.com:plivo/plivo-java.git' - developerConnection 'scm:git:git@github.com:plivo/plivo-java.git' - } } - }.writeTo("pom.xml") -} -} - -uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { - MavenDeployment deployment -> signing.signPom(deployment) - } - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication( - userName: mavenUserName, - password: mavenPassword - ) - } - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication( - userName: mavenUserName, - password: mavenPassword - ) - } - pom.project { - name 'plivo-java' - packaging 'jar' - artifactId 'plivo-java' - description 'A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML' - url 'https://github.com/plivo/plivo-java/' - scm { - connection 'scm:git:git@github.com:plivo/plivo-java.git' - developerConnection 'scm:git:git@github.com:plivo/plivo-java.git' - url 'git@github.com:plivo/plivo-java.git' + + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + + credentials { + username = System.getenv("MAVEN_USERNAME") ?: project.findProperty('mavenUserName') ?: '' + password = System.getenv("MAVEN_PASSWORD") ?: project.findProperty('mavenPassword') ?: '' + } } - licenses { - license { - name 'The MIT License' - url 'https://github.com/plivo/plivo-java/blob/4.0/LICENSE.txt' - } - } - organization { - name 'Plivo' - url 'https://api-reference.plivo.com/latest/net/introduction/overview' - } - issueManagement { - system 'GitHub' - url 'https://github.com/plivo/plivo-java/issues' - } - developers { - developer { - name 'The Plivo SDKs Team' - email 'sdks@plivo.com' - } - } - } } - } -} - - -artifacts { - archives javadocJar, sourceJar } signing { - required { gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives + required { !version.endsWith('SNAPSHOT') && gradle.taskGraph.hasTask("publish") } + sign publishing.publications.mavenJava } diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 66166b08..99a8c26a 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -14,179 +14,175 @@ --> - + + + - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1aef6e1d1d869c1d32f26de59b7aefa4a75f01ce Mon Sep 17 00:00:00 2001 From: Kanishka Devi Plivo <88705700+kanishka2104@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:27:27 +0530 Subject: [PATCH 04/10] version update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca032821..29e117e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Change Log -## [5.45.6](https://github.com/plivo/plivo-java/tree/v5.45.5) (2025-02-25) +## [5.45.6](https://github.com/plivo/plivo-java/tree/v5.45.6) (2025-02-25) **Fix - Upgraded version for okhttp3 package.** - Upgraded version for okhttp3 package . From 4cb151eae8d94a703ea210059a32285d128ba040 Mon Sep 17 00:00:00 2001 From: Kanishka Devi Plivo <88705700+kanishka2104@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:29:33 +0530 Subject: [PATCH 05/10] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29e117e3..384b1a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log -## [5.45.6](https://github.com/plivo/plivo-java/tree/v5.45.6) (2025-02-25) +## [5.45.6](https://github.com/plivo/plivo-java/tree/v5.45.6) (2025-03-03) **Fix - Upgraded version for okhttp3 package.** -- Upgraded version for okhttp3 package . +- Upgraded version of the okhttp3 package . ## [5.45.5](https://github.com/plivo/plivo-java/tree/v5.45.5) (2025-02-25) **Enhancement - Supporting parameter_name in WhatsApp Template .** From ec9b0cc4dc71aeab877c27a5b119569c10fe4f60 Mon Sep 17 00:00:00 2001 From: Kanishka Devi Plivo <88705700+kanishka2104@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:32:01 +0530 Subject: [PATCH 06/10] version change --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 22eecefc..1fdef7da 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Plivo Java SDK makes it simpler to integrate communications into your Java a ### To Install Stable release -You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.45.6/plivo-java-5.45.5.jar). +You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.45.6/plivo-java-5.45.6.jar). If you are using Maven, use the following XML to include the Plivo SDK as a dependency. @@ -19,13 +19,13 @@ If you are using Maven, use the following XML to include the Plivo SDK as a depe com.plivo plivo-java - 5.45.5 + 5.45.6 ``` If you are using Gradle, use the following line in your dependencies. ``` -compile 'com.plivo:plivo-java:5.45.5' +compile 'com.plivo:plivo-java:5.45.6' ``` ### To Install Beta release From 3a9358aa0fe780025420866ddef1e994f7af8671 Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Mon, 3 Mar 2025 15:10:13 +0530 Subject: [PATCH 07/10] changed --- build.gradle | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a136ebd7..1f8d95b9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ plugins { id 'checkstyle' id 'idea' id 'eclipse' + id 'application' id 'com.github.johnrengelman.shadow' version '7.1.2' id 'io.codearte.nexus-staging' version '0.30.0' } @@ -90,12 +91,47 @@ nexusStaging { delayBetweenRetriesInMillis = 40000 } +task createPom { + doLast + { + pom { + project { + name 'plivo-java' + packaging 'jar' + description 'A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML' + + licenses { + license { + name 'The MIT License' + url 'https://github.com/plivo/plivo-java/blob/4.0/LICENSE.txt' + distribution 'repo' + } + } + + developers { + developer { + name 'The Plivo SDKs Team' + email 'sdks@plivo.com' + organization 'Plivo, Inc.' + organizationUrl 'https://plivo.com' + } + } + + scm { + url 'git@github.com:plivo/plivo-java.git' + connection 'scm:git:git@github.com:plivo/plivo-java.git' + developerConnection 'scm:git:git@github.com:plivo/plivo-java.git' + } + } + }.writeTo("pom.xml") +} +} + + publishing { publications { mavenJava(MavenPublication) { from components.java - artifact sourcesJar - artifact javadocJar pom { name = 'plivo-java' @@ -157,3 +193,7 @@ signing { required { !version.endsWith('SNAPSHOT') && gradle.taskGraph.hasTask("publish") } sign publishing.publications.mavenJava } + +application { + mainClass = 'com.plivo.examples.Messages' +} From 1828998018dbd98038d05c34efd108610573f3d6 Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Mon, 3 Mar 2025 15:20:11 +0530 Subject: [PATCH 08/10] update --- build.gradle | 73 ++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 1f8d95b9..b8d37a06 100644 --- a/build.gradle +++ b/build.gradle @@ -92,41 +92,48 @@ nexusStaging { } task createPom { - doLast - { - pom { - project { - name 'plivo-java' - packaging 'jar' - description 'A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML' - - licenses { - license { - name 'The MIT License' - url 'https://github.com/plivo/plivo-java/blob/4.0/LICENSE.txt' - distribution 'repo' - } - } - - developers { - developer { - name 'The Plivo SDKs Team' - email 'sdks@plivo.com' - organization 'Plivo, Inc.' - organizationUrl 'https://plivo.com' - } - } - - scm { - url 'git@github.com:plivo/plivo-java.git' - connection 'scm:git:git@github.com:plivo/plivo-java.git' - developerConnection 'scm:git:git@github.com:plivo/plivo-java.git' - } + doLast { + def pomFile = file("$buildDir/pom.xml") + pomFile.parentFile.mkdirs() + pomFile.createNewFile() + pomFile.text = """ + + + 4.0.0 + ${project.group} + plivo-java + ${project.version} + jar + plivo-java + A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML + https://github.com/plivo/plivo-java/ + + + + The MIT License + https://github.com/plivo/plivo-java/blob/4.0/LICENSE.txt + repo + + + + + + The Plivo SDKs Team + sdks@plivo.com + Plivo, Inc. + https://plivo.com + + + + + git@github.com:plivo/plivo-java.git + scm:git:git@github.com:plivo/plivo-java.git + scm:git:git@github.com:plivo/plivo-java.git + + +""" } - }.writeTo("pom.xml") } -} - publishing { publications { From 57fa6bad0c4ec921876402ee2f7c56e1c6c5ab3a Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Mon, 3 Mar 2025 16:48:06 +0530 Subject: [PATCH 09/10] jdk 9 --- build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b8d37a06..90a955f0 100644 --- a/build.gradle +++ b/build.gradle @@ -21,12 +21,13 @@ repositories { java { withJavadocJar() withSourcesJar() - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } + sourceCompatibility = JavaVersion.VERSION_1_9 + targetCompatibility = JavaVersion.VERSION_1_9 } -tasks.withType(JavaCompile).configureEach { +tasks.withType(JavaCompile) { + sourceCompatibility = JavaVersion.VERSION_1_9 + targetCompatibility = JavaVersion.VERSION_1_9 options.compilerArgs << "-Xlint:unchecked" options.compilerArgs << "-XDignore.symbol.file=true" } From d0252f923893c2650cc1e2534274945d15738889 Mon Sep 17 00:00:00 2001 From: kanishka2104 Date: Mon, 3 Mar 2025 17:38:32 +0530 Subject: [PATCH 10/10] version --- build.gradle | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 90a955f0..d92de7fc 100644 --- a/build.gradle +++ b/build.gradle @@ -21,13 +21,13 @@ repositories { java { withJavadocJar() withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_1_9 - targetCompatibility = JavaVersion.VERSION_1_9 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } tasks.withType(JavaCompile) { - sourceCompatibility = JavaVersion.VERSION_1_9 - targetCompatibility = JavaVersion.VERSION_1_9 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 options.compilerArgs << "-Xlint:unchecked" options.compilerArgs << "-XDignore.symbol.file=true" } @@ -48,7 +48,7 @@ dependencies { } checkstyle { - toolVersion = '10.12.5' + toolVersion = '8.45.1' configFile = file("${projectDir}/config/checkstyle/checkstyle.xml") configProperties = [ 'checkstyle.cache.file': "${buildDir}/checkstyle.cache" @@ -87,6 +87,11 @@ shadowJar { archiveBaseName.set("plivo-java-${version}-jar-with-dependencies") } +// Add fatJar task that depends on shadowJar +task fatJar { + dependsOn shadowJar +} + nexusStaging { numberOfRetries = 60 delayBetweenRetriesInMillis = 40000