diff --git a/README.md b/README.md index 1d2bd5a..842d4b0 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,13 @@ To install and run from Gradle, add the following to the build.gradle file: ```gradle dependencies { - compile 'net.thauvin.erik:pinboard-poster:1.0.3' + compile 'net.thauvin.erik:pinboard-poster:1.0.4' } ``` [View Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/java/build.gradle) [View Kotlin DSL Example](https://github.com/ethauvin/pinboard-poster/blob/master/samples/kotlin/build.gradle.kts) -Instructions for using with Maven, Ivy, etc. can be found on [Maven Central](https://search.maven.org/artifact/net.thauvin.erik/pinboard-poster/1.0.3/jar). +Instructions for using with Maven, Ivy, etc. can be found on [Maven Central](https://search.maven.org/artifact/net.thauvin.erik/pinboard-poster/1.0.4/jar). ## Adding diff --git a/build.gradle.kts b/build.gradle.kts index 01b2d22..4a3ee11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,17 +3,17 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { jacoco java - kotlin("jvm") version "1.4.31" + kotlin("jvm") version "1.5.0" `maven-publish` signing id("com.github.ben-manes.versions") version "0.38.0" id("io.gitlab.arturbosch.detekt") version "1.16.0" - id("org.jetbrains.dokka") version "1.4.30" + id("org.jetbrains.dokka") version "1.4.32" id("org.sonarqube") version "3.1.1" } group = "net.thauvin.erik" -version = "1.0.3" +version = "1.0.4" description = "Pinboard Poster for Kotlin/Java" val gitHub = "ethauvin/$name" @@ -31,7 +31,7 @@ val versions: VersionInfo by extra { VersionInfo } repositories { mavenCentral() - jcenter() // needed for Dokka + jcenter() // needed for detekt 1.16.0 } dependencies { @@ -97,7 +97,7 @@ tasks { } val copyToDeploy by registering(Copy::class) { - from(configurations.runtime) { + from(configurations.runtimeClasspath) { exclude("annotations-*.jar") } from(jar) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..f371643 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/pom.xml b/pom.xml index 18b708b..3858244 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ 4.0.0 net.thauvin.erik pinboard-poster - 1.0.3 + 1.0.4 pinboard-poster Pinboard Poster for Kotlin/Java https://github.com/ethauvin/pinboard-poster @@ -39,7 +39,7 @@ org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.4.31 + 1.5.0 compile diff --git a/preflightcheck.sh b/preflightcheck.sh old mode 100644 new mode 100755 index ed82ca7..a3bc4ed --- a/preflightcheck.sh +++ b/preflightcheck.sh @@ -2,7 +2,7 @@ # set source and test locations src="src/main/kotlin/net/thauvin/erik/pinboard" -test="src/main/kotlin/net/thauvin/erik/pinboard" +test="src/test/kotlin/net/thauvin/erik/pinboard" # e.g: .java, .kt, etc. ext=".kt" java8=true @@ -11,7 +11,7 @@ declare -a examples=( "samples/java run" "samples/kotlin run") # e.g: empty or javadoc, etc. -gradle_doc="dokka" +gradle_doc="dokkaJavadoc" # e.g. empty or sonarqube gradle_sonar="sonarqube" # gradle options for examples @@ -163,7 +163,7 @@ examplesMenu() { validateCopyrights() { clear echo -e "${cyan}Validating copyrights...${std}" - for f in "LICENSE.TXT" ${src}/*${ext} ${test}/*${ext} + for f in "LICENSE.txt" ${src}/*${ext} ${test}/*${ext} do if [ -f "$f" ] then diff --git a/samples/java/build.gradle b/samples/java/build.gradle index 01c54f4..ba80a01 100644 --- a/samples/java/build.gradle +++ b/samples/java/build.gradle @@ -15,5 +15,5 @@ repositories { } dependencies { - compile 'net.thauvin.erik:pinboard-poster:1.0.3' + implementation 'net.thauvin.erik:pinboard-poster:1.0.4' } diff --git a/samples/java/gradle/wrapper/gradle-wrapper.properties b/samples/java/gradle/wrapper/gradle-wrapper.properties index 442d913..f371643 100644 --- a/samples/java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/kotlin/build.gradle.kts b/samples/kotlin/build.gradle.kts index 5fa0d8e..29f89ff 100644 --- a/samples/kotlin/build.gradle.kts +++ b/samples/kotlin/build.gradle.kts @@ -1,6 +1,6 @@ plugins { application - kotlin("jvm") version "1.4.31" + kotlin("jvm") version "1.5.0" } // ./gradlew run @@ -13,7 +13,7 @@ repositories { } dependencies { - compile("net.thauvin.erik:pinboard-poster:1.0.3") + implementation("net.thauvin.erik:pinboard-poster:1.0.4") } application { diff --git a/samples/kotlin/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin/gradle/wrapper/gradle-wrapper.properties index 442d913..f371643 100644 --- a/samples/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/updatewrappers.sh b/updatewrappers.sh old mode 100644 new mode 100755