Skip to content

Commit

Permalink
Build: Bump Kotlin, EGT, and Gradle
Browse files Browse the repository at this point in the history
Also sets the Kotlin language and API version to keep compatibility with
projects using older versions of Kotlin.

GitHub: #141
  • Loading branch information
caoimhebyrne authored Jun 28, 2024
1 parent 3be7624 commit 590b10f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
5 changes: 5 additions & 0 deletions api/Elementa.api
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ public final class gg/essential/elementa/UIComponent$Companion {
public final fun guiHint (FZ)F
}

public final class gg/essential/elementa/UIComponent$sam$i$java_util_function_Predicate$0 : java/util/function/Predicate {
public fun <init> (Lkotlin/jvm/functions/Function1;)V
public final synthetic fun test (Ljava/lang/Object;)Z
}

public class gg/essential/elementa/UIConstraints : java/util/Observable {
public fun <init> (Lgg/essential/elementa/UIComponent;)V
public final fun copy ()Lgg/essential/elementa/UIConstraints;
Expand Down
14 changes: 11 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
import gg.essential.gradle.multiversion.StripReferencesTransform.Companion.registerStripReferencesAttribute
import gg.essential.gradle.util.*
import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.6.10"
kotlin("jvm") version "1.9.23"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.8.0"
id("org.jetbrains.dokka") version "1.6.10" apply false
id("org.jetbrains.dokka") version "1.9.20" apply false
id("gg.essential.defaults")
}

kotlin.jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(8))
}
tasks.compileKotlin.setJvmDefault("all-compatibility")

tasks.withType<KotlinCompile> {
setJvmDefault("all-compatibility")
kotlinOptions {
languageVersion = "1.6"
apiVersion = "1.6"
}
}

val internal by configurations.creating {
val relocated = registerRelocationAttribute("internal-relocated") {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pluginManagement {
maven("https://repo.essential.gg/repository/maven-public")
}
plugins {
val egtVersion = "0.3.0"
val egtVersion = "0.5.0"
id("gg.essential.defaults") version egtVersion
id("gg.essential.multi-version.root") version egtVersion
id("gg.essential.multi-version.api-validation") version egtVersion
Expand Down

0 comments on commit 590b10f

Please sign in to comment.