From a8855096b329a76279d095949dd9a59de3f6c775 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 22 May 2024 20:26:19 -0700 Subject: [PATCH] Bumped Kotlin to version 2.0.0 --- README.md | 6 +++--- config/detekt/baseline.xml | 19 +++++++++++++++---- examples/bld/lib/bld/bld-wrapper.properties | 2 +- examples/gradle/build.gradle.kts | 2 +- lib/bld/bld-wrapper.properties | 2 +- pom.xml | 8 ++++---- .../thauvin/erik/bitly/BitlyShortenBuild.java | 2 +- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 5224299..f474433 100644 --- a/README.md +++ b/README.md @@ -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.9.24-7f52ff)](https://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-7f52ff)](https://kotlinlang.org/) [![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![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?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/bitly-shorten) @@ -63,7 +63,7 @@ To use with [bld](https://rife2.com/bld), include the following dependency in yo repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY); scope(compile) - .include(dependency("net.thauvin.erik:bitly-shorten:1.0.1")); + .include(dependency("net.thauvin.erik:bitly-shorten:2.0.0")); ``` Be sure to use the [bld Kotlin extension](https://github.com/rife2/bld-kotlin) in your project. @@ -79,7 +79,7 @@ repositories { } dependencies { - implementation("net.thauvin.erik:bitly-shorten:1.0.1") + implementation("net.thauvin.erik:bitly-shorten:2.0.0") } ``` diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml index 3d4032c..bbdfbef 100644 --- a/config/detekt/baseline.xml +++ b/config/detekt/baseline.xml @@ -2,6 +2,8 @@ + ConstructorParameterNaming:CreateConfig.kt$CreateConfig$var group_guid: String = Constants.EMPTY + ConstructorParameterNaming:CreateConfig.kt$CreateConfig$var long_url: String ConstructorParameterNaming:CreateConfig.kt$CreateConfig.Builder$var long_url: String FunctionParameterNaming:Bitlinks.kt$Bitlinks$bitlink_id: String FunctionParameterNaming:Bitlinks.kt$Bitlinks$custom_bitlink: String @@ -10,8 +12,18 @@ FunctionParameterNaming:Bitlinks.kt$Bitlinks$unit_reference: String = Constants.EMPTY FunctionParameterNaming:CreateConfig.kt$CreateConfig.Builder$group_guid: String FunctionParameterNaming:CreateConfig.kt$CreateConfig.Builder$long_url: String - LongParameterList:Bitlinks.kt$Bitlinks$( bitlink: String, title: String = Constants.EMPTY, archived: Boolean = false, tags: Array<String> = emptyArray(), deeplinks: Array<Map<String, String>> = emptyArray(), toJson: Boolean = false ) - LongParameterList:Bitlinks.kt$Bitlinks$( long_url: String, domain: String = Constants.EMPTY, group_guid: String = Constants.EMPTY, title: String = Constants.EMPTY, tags: Array<String> = emptyArray(), deeplinks: Array<Map<String, String>> = emptyArray(), toJson: Boolean = false ) + FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$app_id: String + FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$app_uri_path: String + FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$install_type: InstallType + FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$install_url: String + FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$app_guid: String + FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$app_uri_path: String + FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$brand_guid: String + FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$install_type: InstallType + FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$install_url: String + LongParameterList:Bitlinks.kt$Bitlinks$( bitlink: String, title: String = Constants.EMPTY, archived: Boolean = false, tags: Array<String> = emptyArray(), deeplinks: UpdateDeeplinks = UpdateDeeplinks(), toJson: Boolean = false ) + LongParameterList:Bitlinks.kt$Bitlinks$( long_url: String, domain: String = Constants.EMPTY, group_guid: String = Constants.EMPTY, title: String = Constants.EMPTY, tags: Array<String> = emptyArray(), deeplinks: CreateDeeplinks = CreateDeeplinks(), toJson: Boolean = false ) + LongParameterList:CreateConfig.kt$CreateConfig$( var long_url: String, var domain: String = Constants.EMPTY, var group_guid: String = Constants.EMPTY, var title: String = Constants.EMPTY, var tags: Array<String> = emptyArray(), var deeplinks: CreateDeeplinks = CreateDeeplinks(), var toJson: Boolean = false ) MagicNumber:CallResponse.kt$CallResponse$200 MagicNumber:CallResponse.kt$CallResponse$201 MagicNumber:CallResponse.kt$CallResponse$299 @@ -29,8 +41,7 @@ NestedBlockDepth:BitlyExample.kt$fun main(args: Array<String>) NestedBlockDepth:Utils.kt$Utils$@JvmStatic @JvmOverloads fun call( accessToken: String, endPoint: String, params: Map<String, Any> = emptyMap(), method: Methods = Methods.POST ): CallResponse NestedBlockDepth:Utils.kt$Utils$private fun parseResponse(response: Response, endPoint: String): CallResponse - VariableNaming:CreateConfig.kt$CreateConfig$val group_guid: String - VariableNaming:CreateConfig.kt$CreateConfig$val long_url: String + TooManyFunctions:UpdateDeeplinks.kt$UpdateDeeplinks VariableNaming:CreateConfig.kt$CreateConfig.Builder$var group_guid: String = Constants.EMPTY WildcardImport:BitlyTest.kt$import assertk.assertions.* WildcardImport:BitlyTest.kt$import kotlin.test.* diff --git a/examples/bld/lib/bld/bld-wrapper.properties b/examples/bld/lib/bld/bld-wrapper.properties index 81004ac..b32aeb6 100644 --- a/examples/bld/lib/bld/bld-wrapper.properties +++ b/examples/bld/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.5 +bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.7 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts index 5a66af6..4d93b77 100644 --- a/examples/gradle/build.gradle.kts +++ b/examples/gradle/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("application") id("com.github.ben-manes.versions") version "0.51.0" - kotlin("jvm") version "1.9.24" + kotlin("jvm") version "2.0.0" } // ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA' diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index f12d89e..3bec20e 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 -bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.5 +bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.7 bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= diff --git a/pom.xml b/pom.xml index e4a69f0..5a7786c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik bitly-shorten - 1.0.2-SNAPSHOT + 2.0.0 bitly-shorten A simple implementation of the Bitly link shortening API v4 https://github.com/ethauvin/bitly-shorten @@ -18,19 +18,19 @@ org.jetbrains.kotlin kotlin-stdlib - 1.9.24 + 2.0.0 compile org.jetbrains.kotlin kotlin-stdlib-common - 1.9.24 + 2.0.0 compile org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.9.24 + 2.0.0 compile diff --git a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java index ed8bb60..d799f4f 100644 --- a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java +++ b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java @@ -69,7 +69,7 @@ public class BitlyShortenBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); var okHttp = version(4, 12, 0); - final var kotlin = version(1, 9, 24); + final var kotlin = version(2, 0, 0); scope(compile) // Kotlin .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))