erik/pinboard-poster
erik/pinboard-poster
1
1
Fork 0
Code Issues Pull requests Releases Activity

Upgraded to Kotlin 1.5.0

Browse source
This commit is contained in:
Erik C. Thauvin 2021-04-28 12:06:04 -07:00
parent a27b5fa6eb
commit 22e23c63e5
10 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -38,13 +38,13 @@ To install and run from Gradle, add the following to the build.gradle file:
```gradle ```gradle
dependencies { 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 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) [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 ## Adding

10
build.gradle.kts
View file

@ -3,17 +3,17 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
jacoco jacoco
java java
kotlin("jvm") version "1.4.31" kotlin("jvm") version "1.5.0"
`maven-publish` `maven-publish`
signing signing
id("com.github.ben-manes.versions") version "0.38.0" id("com.github.ben-manes.versions") version "0.38.0"
id("io.gitlab.arturbosch.detekt") version "1.16.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" id("org.sonarqube") version "3.1.1"
} }
group = "net.thauvin.erik" group = "net.thauvin.erik"
version = "1.0.3" version = "1.0.4"
description = "Pinboard Poster for Kotlin/Java" description = "Pinboard Poster for Kotlin/Java"
val gitHub = "ethauvin/$name" val gitHub = "ethauvin/$name"
@ -31,7 +31,7 @@ val versions: VersionInfo by extra { VersionInfo }
repositories { repositories {
mavenCentral() mavenCentral()
jcenter() // needed for Dokka jcenter() // needed for detekt 1.16.0
} }
dependencies { dependencies {
@ -97,7 +97,7 @@ tasks {
} }
val copyToDeploy by registering(Copy::class) { val copyToDeploy by registering(Copy::class) {
from(configurations.runtime) { from(configurations.runtimeClasspath) {
exclude("annotations-*.jar") exclude("annotations-*.jar")
} }
from(jar) from(jar)

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
pom.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This module was also published with a richer model, Gradle metadata, --> <!-- This module was also published with a richer model, Gradle metadata, -->
<!-- which should be used instead. Do not delete the following line which --> <!-- which should be used instead. Do not delete the following line which -->
<!-- is to indicate to Gradle or any Gradle module metadata file consumer --> <!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.thauvin.erik</groupId> <groupId>net.thauvin.erik</groupId>
<artifactId>pinboard-poster</artifactId> <artifactId>pinboard-poster</artifactId>
<version>1.0.3</version> <version>1.0.4</version>
<name>pinboard-poster</name> <name>pinboard-poster</name>
<description>Pinboard Poster for Kotlin/Java</description> <description>Pinboard Poster for Kotlin/Java</description>
<url>https://github.com/ethauvin/pinboard-poster</url> <url>https://github.com/ethauvin/pinboard-poster</url>
@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
<version>1.4.31</version> <version>1.5.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
preflightcheck.sh Normal file → Executable file
View file

@ -2,7 +2,7 @@
# set source and test locations # set source and test locations
src="src/main/kotlin/net/thauvin/erik/pinboard" 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. # e.g: .java, .kt, etc.
ext=".kt" ext=".kt"
java8=true java8=true
@ -11,7 +11,7 @@ declare -a examples=(
"samples/java run" "samples/java run"
"samples/kotlin run") "samples/kotlin run")
# e.g: empty or javadoc, etc. # e.g: empty or javadoc, etc.
gradle_doc="dokka" gradle_doc="dokkaJavadoc"
# e.g. empty or sonarqube # e.g. empty or sonarqube
gradle_sonar="sonarqube" gradle_sonar="sonarqube"
# gradle options for examples # gradle options for examples
@ -163,7 +163,7 @@ examplesMenu() {
validateCopyrights() { validateCopyrights() {
clear clear
echo -e "${cyan}Validating copyrights...${std}" 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 do
if [ -f "$f" ] if [ -f "$f" ]
then then

2
samples/java/build.gradle
View file

@ -15,5 +15,5 @@ repositories {
} }
dependencies { dependencies {
compile 'net.thauvin.erik:pinboard-poster:1.0.3' implementation 'net.thauvin.erik:pinboard-poster:1.0.4'
} }

2
samples/java/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
samples/kotlin/build.gradle.kts
View file

@ -1,6 +1,6 @@
plugins { plugins {
application application
kotlin("jvm") version "1.4.31" kotlin("jvm") version "1.5.0"
} }
// ./gradlew run // ./gradlew run
@ -13,7 +13,7 @@ repositories {
} }
dependencies { dependencies {
compile("net.thauvin.erik:pinboard-poster:1.0.3") implementation("net.thauvin.erik:pinboard-poster:1.0.4")
} }
application { application {

2
samples/kotlin/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

0
updatewrappers.sh Normal file → Executable file
View file