Kotlin Base64-encoding

buildSrc/build.gradle.kts

@@ -20,8 +20,6 @@
 import org.gradle.accessors.dm.LibrariesForLibs
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 private val Project.libs: LibrariesForLibs
     get() = extensions.getByType()
@@ -56,15 +54,3 @@ tasks.withType<JavaCompile>().configureEach {
     sourceCompatibility = maxKotlinJvmTarget.target
     targetCompatibility = maxKotlinJvmTarget.target
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlin.ExperimentalStdlibApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-        languageVersion = KotlinVersion.KOTLIN_1_9
-        jvmTarget = maxKotlinJvmTarget
-    }
-}

buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts

@@ -114,7 +114,7 @@ detekt {
 
 val javaVersion = JavaVersion.current()
 val maxKotlinJvmTarget = runCatching { JvmTarget.fromTarget(javaVersion.majorVersion) }
-    .getOrDefault(JvmTarget.entries.max())
+    .getOrDefault(enumValues<JvmTarget>().max())
 
 val mergeDetektReportsTaskName = "mergeDetektReports"
 val mergeDetektReports = if (rootProject.tasks.findByName(mergeDetektReportsTaskName) != null) {
@@ -157,11 +157,15 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlin.contracts.ExperimentalContracts",
-        "-opt-in=kotlin.io.path.ExperimentalPathApi",
-        "-opt-in=kotlin.time.ExperimentalTime"
-    )
+    val hasSerialization = plugins.hasPlugin(libs.plugins.kotlinSerialization.get().pluginId)
+
+    val customCompilerArgs = buildList {
+        add("-opt-in=kotlin.contracts.ExperimentalContracts")
+        add("-opt-in=kotlin.io.encoding.ExperimentalEncodingApi")
+        add("-opt-in=kotlin.io.path.ExperimentalPathApi")
+        add("-opt-in=kotlin.time.ExperimentalTime")
+        if (hasSerialization) add("-opt-in=kotlinx.serialization.ExperimentalSerializationApi")
+    }
 
     compilerOptions {
         allWarningsAsErrors = true

clients/clearly-defined/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -36,13 +34,3 @@ dependencies {
     implementation(libs.retrofit.converter.kotlinxSerialization)
     implementation(libs.retrofit.converter.scalars)
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

clients/fossid-webapp/src/main/kotlin/Extensions.kt

@@ -22,7 +22,8 @@
 package org.ossreviewtoolkit.clients.fossid
 
 import java.io.File
-import java.util.Base64
+
+import kotlin.io.encoding.Base64
 
 import okio.buffer
 import okio.sink
@@ -41,8 +42,6 @@ internal const val SCAN_GROUP = "scans"
 private const val FILES_AND_FOLDERS_GROUP = "files_and_folders"
 private const val PROJECT_GROUP = "projects"
 
-private val base64Encoder = Base64.getEncoder()
-
 /**
  * Verify that a request for the given [operation] was successful. [operation] is a free label describing the operation.
  * If [withDataCheck] is true, also the payload data is checked, otherwise that check is skipped.
@@ -260,7 +259,7 @@ suspend fun FossIdRestService.listSnippets(
     scanCode: String,
     path: String
 ): PolymorphicResponseBody<Snippet> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     return listSnippets(
         PostRequestBody(
             "get_fossid_results",
@@ -285,7 +284,7 @@ suspend fun FossIdRestService.listMatchedLines(
     path: String,
     snippetId: Int
 ): EntityResponseBody<MatchedLines> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     return listMatchedLines(
         PostRequestBody(
             "get_matched_lines",
@@ -463,7 +462,7 @@ suspend fun FossIdRestService.markAsIdentified(
     path: String,
     isDirectory: Boolean
 ): EntityResponseBody<Nothing> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     val directoryFlag = if (isDirectory) "1" else "0"
     return markAsIdentified(
         PostRequestBody(
@@ -488,7 +487,7 @@ suspend fun FossIdRestService.unmarkAsIdentified(
     path: String,
     isDirectory: Boolean
 ): EntityResponseBody<Nothing> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     val directoryFlag = if (isDirectory) "1" else "0"
     return unmarkAsIdentified(
         PostRequestBody(
@@ -515,7 +514,7 @@ suspend fun FossIdRestService.addLicenseIdentification(
     identificationOn: LicenseMatchType,
     isDirectory: Boolean
 ): EntityResponseBody<Nothing> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     val directoryFlag = if (isDirectory) "1" else "0"
     return addLicenseIdentification(
         PostRequestBody(
@@ -552,7 +551,7 @@ suspend fun FossIdRestService.addComponentIdentification(
     isDirectory: Boolean,
     preserveExistingIdentifications: Boolean = true
 ): EntityResponseBody<Nothing> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     val directoryFlag = if (isDirectory) "1" else "0"
     val preserveExistingIdentificationsFlag = if (preserveExistingIdentifications) "1" else "0"
     return addComponentIdentification(
@@ -587,7 +586,7 @@ suspend fun FossIdRestService.addFileComment(
     isImportant: Boolean = false,
     includeInReport: Boolean = false
 ): EntityResponseBody<Nothing> {
-    val base64Path = base64Encoder.encodeToString(path.toByteArray())
+    val base64Path = Base64.encode(path.toByteArray())
     val isImportantFlag = if (isImportant) "1" else "0"
     val includeInReportFlag = if (includeInReport) "1" else "0"
     return addFileComment(

clients/nexus-iq/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -34,13 +32,3 @@ dependencies {
     implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

clients/osv/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -37,13 +35,3 @@ dependencies {
 
     testImplementation(libs.kotest.assertions.json)
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

clients/scanoss/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -36,13 +34,3 @@ dependencies {
 
     testImplementation(libs.wiremock)
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

clients/vulnerable-code/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -34,13 +32,3 @@ dependencies {
     implementation(libs.bundles.kotlinxSerialization)
     implementation(libs.retrofit.converter.kotlinxSerialization)
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

evaluator/build.gradle.kts

@@ -19,8 +19,6 @@
 
 import de.undercouch.gradle.tasks.download.Download
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -45,16 +43,6 @@ dependencies {
     testImplementation(libs.mockk)
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}
-
 tasks.register<Download>("updateOsadlMatrix") {
     description = "Download the OSADL matrix in JSON format and add it as a resource."
     group = "OSADL"

model/src/main/kotlin/Hash.kt

@@ -23,7 +23,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.fasterxml.jackson.databind.util.StdConverter
 
 import java.io.File
-import java.util.Base64
+
+import kotlin.io.encoding.Base64
 
 import org.ossreviewtoolkit.utils.common.decodeHex
 import org.ossreviewtoolkit.utils.common.encodeHex
@@ -59,7 +60,7 @@ data class Hash(
                 // Support Subresource Integrity (SRI) hashes, see
                 // https://w3c.github.io/webappsec-subresource-integrity/
                 Hash(
-                    value = Base64.getDecoder().decode(splitValue.last()).encodeHex(),
+                    value = Base64.decode(splitValue.last()).encodeHex(),
                     algorithm = HashAlgorithm.fromString(splitValue.first())
                 )
             } else {
@@ -82,7 +83,7 @@ data class Hash(
     /**
      * Return the hash in Support Subresource Integrity (SRI) format.
      */
-    fun toSri() = algorithm.name.lowercase() + "-" + Base64.getEncoder().encodeToString(value.decodeHex())
+    fun toSri() = algorithm.name.lowercase() + "-" + Base64.encode(value.decodeHex())
 
     /**
      * Verify that the [file] matches this hash.

plugins/advisors/osv/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -35,13 +33,3 @@ dependencies {
     implementation(libs.cvssCalculator)
     implementation(libs.bundles.kotlinxSerialization)
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

plugins/package-managers/cargo/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -47,13 +45,3 @@ dependencies {
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

plugins/package-managers/go/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -47,13 +45,3 @@ dependencies {
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}

plugins/package-managers/nuget/build.gradle.kts

@@ -17,8 +17,6 @@
  * License-Filename: LICENSE
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     // Apply precompiled plugins.
     id("ort-library-conventions")
@@ -41,13 +39,3 @@ dependencies {
 
     funTestImplementation(testFixtures(projects.analyzer))
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    val customCompilerArgs = listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    )
-
-    compilerOptions {
-        freeCompilerArgs.addAll(customCompilerArgs)
-    }
-}