Bumped Kotlin to version 2.0.0

ethauvin · May 23, 2024 · bd3e3e3 · bd3e3e3
1 parent 68b4f84
commit bd3e3e3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git 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
@@ -2,6 +2,8 @@
 <SmellBaseline>
  <ManuallySuppressedIssues></ManuallySuppressedIssues>
  <CurrentIssues>
+ <ID>ConstructorParameterNaming:CreateConfig.kt$CreateConfig$var group_guid: String = Constants.EMPTY</ID>
+ <ID>ConstructorParameterNaming:CreateConfig.kt$CreateConfig$var long_url: String</ID>
  <ID>ConstructorParameterNaming:CreateConfig.kt$CreateConfig.Builder$var long_url: String</ID>
  <ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$bitlink_id: String</ID>
  <ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$custom_bitlink: String</ID>
@@ -10,8 +12,18 @@
  <ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$unit_reference: String = Constants.EMPTY</ID>
  <ID>FunctionParameterNaming:CreateConfig.kt$CreateConfig.Builder$group_guid: String</ID>
  <ID>FunctionParameterNaming:CreateConfig.kt$CreateConfig.Builder$long_url: String</ID>
- <ID>LongParameterList:Bitlinks.kt$Bitlinks$( bitlink: String, title: String = Constants.EMPTY, archived: Boolean = false, tags: Array&lt;String&gt; = emptyArray(), deeplinks: Array&lt;Map&lt;String, String&gt;&gt; = emptyArray(), toJson: Boolean = false )</ID>
- <ID>LongParameterList:Bitlinks.kt$Bitlinks$( long_url: String, domain: String = Constants.EMPTY, group_guid: String = Constants.EMPTY, title: String = Constants.EMPTY, tags: Array&lt;String&gt; = emptyArray(), deeplinks: Array&lt;Map&lt;String, String&gt;&gt; = emptyArray(), toJson: Boolean = false )</ID>
+ <ID>FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$app_id: String</ID>
+ <ID>FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$app_uri_path: String</ID>
+ <ID>FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$install_type: InstallType</ID>
+ <ID>FunctionParameterNaming:CreateDeeplinks.kt$CreateDeeplinks$install_url: String</ID>
+ <ID>FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$app_guid: String</ID>
+ <ID>FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$app_uri_path: String</ID>
+ <ID>FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$brand_guid: String</ID>
+ <ID>FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$install_type: InstallType</ID>
+ <ID>FunctionParameterNaming:UpdateDeeplinks.kt$UpdateDeeplinks$install_url: String</ID>
+ <ID>LongParameterList:Bitlinks.kt$Bitlinks$( bitlink: String, title: String = Constants.EMPTY, archived: Boolean = false, tags: Array&lt;String&gt; = emptyArray(), deeplinks: UpdateDeeplinks = UpdateDeeplinks(), toJson: Boolean = false )</ID>
+ <ID>LongParameterList:Bitlinks.kt$Bitlinks$( long_url: String, domain: String = Constants.EMPTY, group_guid: String = Constants.EMPTY, title: String = Constants.EMPTY, tags: Array&lt;String&gt; = emptyArray(), deeplinks: CreateDeeplinks = CreateDeeplinks(), toJson: Boolean = false )</ID>
+ <ID>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&lt;String&gt; = emptyArray(), var deeplinks: CreateDeeplinks = CreateDeeplinks(), var toJson: Boolean = false )</ID>
  <ID>MagicNumber:CallResponse.kt$CallResponse$200</ID>
  <ID>MagicNumber:CallResponse.kt$CallResponse$201</ID>
  <ID>MagicNumber:CallResponse.kt$CallResponse$299</ID>
@@ -29,8 +41,7 @@
  <ID>NestedBlockDepth:BitlyExample.kt$fun main(args: Array&lt;String&gt;)</ID>
  <ID>NestedBlockDepth:Utils.kt$Utils$@JvmStatic @JvmOverloads fun call( accessToken: String, endPoint: String, params: Map&lt;String, Any&gt; = emptyMap(), method: Methods = Methods.POST ): CallResponse</ID>
  <ID>NestedBlockDepth:Utils.kt$Utils$private fun parseResponse(response: Response, endPoint: String): CallResponse</ID>
- <ID>VariableNaming:CreateConfig.kt$CreateConfig$val group_guid: String</ID>
- <ID>VariableNaming:CreateConfig.kt$CreateConfig$val long_url: String</ID>
+ <ID>TooManyFunctions:UpdateDeeplinks.kt$UpdateDeeplinks</ID>
  <ID>VariableNaming:CreateConfig.kt$CreateConfig.Builder$var group_guid: String = Constants.EMPTY</ID>
  <ID>WildcardImport:BitlyTest.kt$import assertk.assertions.*</ID>
  <ID>WildcardImport:BitlyTest.kt$import kotlin.test.*</ID>

diff --git 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
@@ -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
@@ -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/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
@@ -69,7 +69,7 @@ public BitlyShortenBuild() {
  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))