reverse some code changes which require Kotlin 2.x

Author: mikepenz

plugin-build/plugin/build.gradle.kts

@@ -1,5 +1,5 @@
 import com.vanniktech.maven.publish.GradlePublishPlugin
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
  id("com.android.lint")
@@ -44,8 +44,8 @@ java {
 kotlin {
  jvmToolchain(11)
  compilerOptions {
- apiVersion.set(KOTLIN_1_8)
- languageVersion.set(KOTLIN_1_8)
+ apiVersion.set(KotlinVersion.KOTLIN_1_8)
+ languageVersion.set(KotlinVersion.KOTLIN_1_8)
  }
 }
 

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesTask.kt

@@ -34,7 +34,7 @@ abstract class AboutLibrariesTask : BaseAboutLibrariesTask() {
  abstract val deprecated: Property<Boolean>
 
  override fun getDescription(): String = "Exports dependency meta data from the current module.${variant.orNull?.let { " Filtered by variant: '$it'." } ?: ""}"
- override fun getGroup(): String = super.group ?: org.gradle.language.base.plugins.LifecycleBasePlugin.BUILD_GROUP
+ override fun getGroup(): String = super.getGroup() ?: org.gradle.language.base.plugins.LifecycleBasePlugin.BUILD_GROUP
 
  fun configureOutputFile(outputFile: Provider<RegularFile>? = null) {
  if (outputFile != null && outputFile.isPresent) {

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/mapping/License.kt

@@ -57,7 +57,7 @@ data class License(
  * Ensures and applies fixes to the library names (shorten, ...)
  */
 private fun resolveLicenseId(name: String, url: String?): String? {
- for (l: SpdxLicense in SpdxLicense.entries) {
+ for (l: SpdxLicense in SpdxLicense.values()) {
  val matcher = l.customMatcher
  if (l.id.equals(name, true) || l.name.equals(name, true) || l.fullName.equals(name, true) || (matcher != null && matcher.invoke(name, url))) {
  return l.id

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/mapping/SpdxLicense.kt

@@ -208,13 +208,15 @@ enum class SpdxLicense(
  Leptonica("Leptonica License", "Leptonica"),
  LGPL_2_0_only("GNU Library General Public License v2 only", "LGPL-2.0-only"),
  LGPL_2_0_or_later("GNU Library General Public License v2 or later", "LGPL-2.0-or-later"),
- LGPL_2_1_only("GNU Lesser General Public License v2.1 only", "LGPL-2.1-only",
+ LGPL_2_1_only(
+ "GNU Lesser General Public License v2.1 only", "LGPL-2.1-only",
  customMatcher = { name, _ ->
  name.equals("GNU Lesser General Public License (LGPL), Version 2.1", true)
  }
  ),
  LGPL_2_1_or_later("GNU Lesser General Public License v2.1 or later", "LGPL-2.1-or-later"),
- LGPL_3_0_only("GNU Lesser General Public License v3.0 only", "LGPL-3.0-only",
+ LGPL_3_0_only(
+ "GNU Lesser General Public License v3.0 only", "LGPL-3.0-only",
  customMatcher = { name, _ ->
  name.equals("GNU General Lesser Public License (LGPL) version 3.0", true)
  }
@@ -247,11 +249,12 @@ enum class SpdxLicense(
  mpich2("mpich2 License", "mpich2"),
  MPL_1_0("Mozilla Public License 1.0", "MPL-1.0"),
  MPL_1_1("Mozilla Public License 1.1", "MPL-1.1"),
- MPL_2_0("Mozilla Public License 2.0", "MPL-2.0",
+ MPL_2_0(
+ "Mozilla Public License 2.0", "MPL-2.0",
  customMatcher = { name, url ->
  name.contains("Mozilla Public License", true)
-  && url?.contains("mozilla.org", true) == true
-  && url.contains("MPL/2.0", true)
+ && url?.contains("mozilla.org", true) == true
+ && url.contains("MPL/2.0", true)
  }
  ),
  MPL_2_0_no_copyleft_exception(
@@ -474,7 +477,7 @@ enum class SpdxLicense(
 
  companion object {
  internal fun find(key: String): SpdxLicense? {
- for (l: SpdxLicense in entries) {
+ for (l: SpdxLicense in values()) {
  if (l.id.equals(key, true) || l.name.equals(key, true) || l.fullName.equals(key, true)) {
  return l
  }
@@ -483,7 +486,7 @@ enum class SpdxLicense(
  }
 
  internal fun getById(id: String): SpdxLicense {
- return entries.first { it.id.equals(id, true) }
+ return values().first { it.id.equals(id, true) }
  }
  }
 }