Skip to content

Commit

Permalink
Updated dependencies and snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
ethauvin committed Jun 29, 2023
1 parent 3d6101d commit 45e2915
Show file tree
Hide file tree
Showing 33 changed files with 328 additions and 323 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause)
[![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-7f52ff)](https://kotlinlang.org/)
[![Kotlin](https://img.shields.io/badge/kotlin-1.8.22-7f52ff)](https://kotlinlang.org/)
[![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/bitly-shorten?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/bitly-shorten/)
[![Release](https://img.shields.io/github/release/ethauvin/bitly-shorten.svg)](https://github.com/ethauvin/bitly-shorten/releases/latest)
[![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/bitly-shorten.svg?label=maven%20central)](https://search.maven.org/search?q=g:%22net.thauvin.erik%22%20AND%20a:%22bitly-shorten%22)
Expand Down
40 changes: 22 additions & 18 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URL

plugins {
id("com.github.ben-manes.versions") version "0.46.0"
id("io.gitlab.arturbosch.detekt") version "1.22.0"
id("com.github.ben-manes.versions") version "0.47.0"
id("io.gitlab.arturbosch.detekt") version "1.23.0"
id("java")
id("java-library")
id("maven-publish")
id("net.thauvin.erik.gradle.semver") version "1.0.4"
id("org.jetbrains.dokka") version "1.8.10"
id("org.jetbrains.kotlinx.kover") version "0.6.1"
id("org.sonarqube") version "4.0.0.2929"
id("org.jetbrains.dokka") version "1.8.20"
id("org.jetbrains.kotlinx.kover") version "0.7.2"
id("org.sonarqube") version "4.2.1.3168"
id("signing")
kotlin("jvm") version "1.8.20"
kotlin("kapt") version "1.8.20"
kotlin("jvm") version "1.8.22"
kotlin("kapt") version "1.8.22"
}

group = "net.thauvin.erik"
Expand All @@ -32,7 +32,7 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
val publicationName = "mavenJava"

object Versions {
const val OKHTTP = "4.10.0"
const val OKHTTP = "4.11.0"
}

fun isNonStable(version: String): Boolean {
Expand All @@ -52,11 +52,11 @@ dependencies {

implementation("com.squareup.okhttp3:okhttp:${Versions.OKHTTP}")
implementation("com.squareup.okhttp3:logging-interceptor:${Versions.OKHTTP}")
implementation("org.json:json:20230227")
implementation("org.json:json:20230618")

testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit"))
testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")
testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.26.1")
}

kapt {
Expand All @@ -76,13 +76,24 @@ java {
withSourcesJar()
}

koverReport {
defaults {
xml {
onCheck = true
}
html {
onCheck = true
}
}
}

sonarqube {
properties {
property("sonar.projectKey", "ethauvin_$name")
property("sonar.organization", "ethauvin-github")
property("sonar.host.url", "https://sonarcloud.io")
property("sonar.sourceEncoding", "UTF-8")
property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/xml/report.xml")
property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml")
}
}

Expand Down Expand Up @@ -116,9 +127,6 @@ tasks {
destination = file("$projectDir/pom.xml")
}

assemble {
dependsOn(koverReport)
}

clean {
doLast {
Expand Down Expand Up @@ -191,10 +199,6 @@ tasks {
group = PublishingPlugin.PUBLISH_TASK_GROUP
dependsOn(wrapper, "deploy", gitTag, publishToMavenLocal)
}

"sonar" {
dependsOn(koverReport)
}
}

publishing {
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h1 class="cover"><span>Create</span><wbr></wbr><span><span>Config</span></span>
<div class="platform-hinted " data-platform-hinted="data-platform-hinted"><div class="content sourceset-dependent-content" data-active="" data-togglable=":dokkaHtml/main"><div class="symbol monospace"><span class="token keyword">class </span><a href="index.html">CreateConfig</a><span class="clearfix"><span class="floating-right">(<a href="https://github.com/ethauvin/bitly-shorten/tree/master/src/main/kotlin//net/thauvin/erik/bitly/config/CreateConfig.kt#L39">source</a>)</span></span></div><p class="paragraph">Provides a builder to create a Bitlink.</p></div></div>
</div>
<div class="tabbedcontent">
<div class="tabs-section" tabs-section="tabs-section"><button class="section-tab" data-active="" data-togglable="CONSTRUCTOR,TYPE,FUNCTION,PROPERTY">Members</button></div>
<div class="tabs-section" tabs-section="tabs-section"><button class="section-tab" data-active="" data-togglable="CONSTRUCTOR,TYPE,PROPERTY,FUNCTION">Members</button></div>
<div class="tabs-section-body">
<div data-togglable="TYPE">
<h2 class="">Types</h2>
Expand Down
Loading

0 comments on commit 45e2915

Please sign in to comment.