Merge pull request #569 from usefulness/updates

Update Kotlin target to 1.8
usefulness · Mar 2, 2024 · aca8bfc · aca8bfc
2 parents da85ed2 + 63b97c9
commit aca8bfc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 22 deletions.
diff --git a/easylauncher/build.gradle b/easylauncher/build.gradle
@@ -44,8 +44,8 @@ tasks.withType(PluginUnderTestMetadata).configureEach {
 
 tasks.withType(KotlinCompile).configureEach {
     compilerOptions {
-        apiVersion = KotlinVersion.KOTLIN_1_4
-        languageVersion = KotlinVersion.KOTLIN_1_4
+        apiVersion = KotlinVersion.KOTLIN_1_8
+        languageVersion = KotlinVersion.KOTLIN_1_8
     }
 }
 kotlin {

diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherConfig.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherConfig.kt
@@ -4,7 +4,6 @@ import com.project.starter.easylauncher.filter.ChromeLikeFilter
 import com.project.starter.easylauncher.filter.ColorRibbonFilter
 import com.project.starter.easylauncher.filter.EasyLauncherFilter
 import com.project.starter.easylauncher.filter.OverlayFilter
-import com.project.starter.easylauncher.plugin.internal.uppercase
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property

diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherPlugin.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherPlugin.kt
@@ -4,8 +4,6 @@ import com.android.build.api.AndroidPluginVersion
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.Variant
 import com.android.build.gradle.BaseExtension
-import com.project.starter.easylauncher.plugin.internal.replaceFirstChar
-import com.project.starter.easylauncher.plugin.internal.titleCase
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import java.io.File
@@ -119,7 +117,7 @@ class EasyLauncherPlugin : Plugin<Project> {
                         }
                         .flatten()
 
-                    val capitalisedVariantName = variant.name.replaceFirstChar(Char::titleCase)
+                    val capitalisedVariantName = variant.name.replaceFirstChar(Char::titlecase)
                     val task = project.tasks.register("easylauncher$capitalisedVariantName", EasyLauncherTask::class.java) {
                         it.manifestFiles.set(manifests)
                         it.manifestPlaceholders.set(variant.manifestPlaceholders)

diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/IconTransformer.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/IconTransformer.kt
@@ -2,7 +2,6 @@ package com.project.starter.easylauncher.plugin
 
 import com.project.starter.easylauncher.filter.Canvas
 import com.project.starter.easylauncher.filter.EasyLauncherFilter
-import com.project.starter.easylauncher.plugin.internal.lowercase
 import com.project.starter.easylauncher.plugin.models.toSize
 import groovy.xml.XmlSlurper
 import java.awt.image.BufferedImage

diff --git a/...auncher/src/main/kotlin/com/project/starter/easylauncher/plugin/internal/Kotlin15Utils.kt b/...auncher/src/main/kotlin/com/project/starter/easylauncher/plugin/internal/Kotlin15Utils.kt