Skip to content

Commit

Permalink
Upgrade to Kotlin 1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@alancai98
alancai98 committed Sep 10, 2024
1 parent 1dbb203 commit 15e48a0
Show file tree
Hide file tree
Showing 16 changed files with 100 additions and 14 deletions.
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ repositories {
object Versions {
const val binaryCompatibilityValidator = "0.14.0"
const val detekt = "1.20.0-RC2"
const val dokka = "1.6.10"
const val kotlin = "1.6.20"
const val dokka = "1.9.20"
const val kotlin = "1.9.20"
const val ktlintGradle = "10.2.1"
const val nexusPublish = "2.0.0"
const val pig = "0.6.1"
const val pig = "0.6.3"
const val shadow = "8.1.1"
}

Expand Down
14 changes: 7 additions & 7 deletions buildSrc/src/main/kotlin/partiql.versions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

object Versions {
// Language
const val kotlin = "1.6.20"
const val kotlinLanguage = "1.6"
const val kotlinApi = "1.6"
const val kotlin = "1.9.20"
const val kotlinLanguage = "1.9"
const val kotlinApi = "1.9"
const val jvmTarget = "1.8"

// Dependencies
Expand All @@ -45,9 +45,9 @@ object Versions {
const val kotlinxCollections = "0.3.5"
const val picoCli = "4.7.0"
const val kasechange = "1.3.0"
const val pig = "0.6.2"
const val kotlinxCoroutines = "1.6.0"
const val kotlinxCoroutinesJdk8 = "1.6.0"
const val pig = "0.6.3"
const val kotlinxCoroutines = "1.8.1"
const val kotlinxCoroutinesJdk8 = "1.8.1"
const val ktlint = "0.42.1" // we're on an old version of ktlint. TODO upgrade https://github.com/partiql/partiql-lang-kotlin/issues/1418

// Testing
Expand All @@ -59,7 +59,7 @@ object Versions {
const val junit4Params = "1.1.1"
const val mockito = "4.5.0"
const val mockk = "1.11.0"
const val kotlinxCoroutinesTest = "1.6.0"
const val kotlinxCoroutinesTest = "1.8.1"
}

object Deps {
Expand Down
17 changes: 17 additions & 0 deletions partiql-ast/api/partiql-ast.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ public final class org/partiql/ast/DatetimeField : java/lang/Enum {
public static final field TIMEZONE_HOUR Lorg/partiql/ast/DatetimeField;
public static final field TIMEZONE_MINUTE Lorg/partiql/ast/DatetimeField;
public static final field YEAR Lorg/partiql/ast/DatetimeField;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/DatetimeField;
public static fun values ()[Lorg/partiql/ast/DatetimeField;
}
Expand Down Expand Up @@ -464,6 +465,7 @@ public final class org/partiql/ast/Expr$Collection$Type : java/lang/Enum {
public static final field LIST Lorg/partiql/ast/Expr$Collection$Type;
public static final field SEXP Lorg/partiql/ast/Expr$Collection$Type;
public static final field VALUES Lorg/partiql/ast/Expr$Collection$Type;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Expr$Collection$Type;
public static fun values ()[Lorg/partiql/ast/Expr$Collection$Type;
}
Expand Down Expand Up @@ -962,6 +964,7 @@ public final class org/partiql/ast/Expr$SessionAttribute : org/partiql/ast/Expr
public final class org/partiql/ast/Expr$SessionAttribute$Attribute : java/lang/Enum {
public static final field CURRENT_DATE Lorg/partiql/ast/Expr$SessionAttribute$Attribute;
public static final field CURRENT_USER Lorg/partiql/ast/Expr$SessionAttribute$Attribute;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Expr$SessionAttribute$Attribute;
public static fun values ()[Lorg/partiql/ast/Expr$SessionAttribute$Attribute;
}
Expand Down Expand Up @@ -1060,6 +1063,7 @@ public final class org/partiql/ast/Expr$Trim$Spec : java/lang/Enum {
public static final field BOTH Lorg/partiql/ast/Expr$Trim$Spec;
public static final field LEADING Lorg/partiql/ast/Expr$Trim$Spec;
public static final field TRAILING Lorg/partiql/ast/Expr$Trim$Spec;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Expr$Trim$Spec;
public static fun values ()[Lorg/partiql/ast/Expr$Trim$Spec;
}
Expand Down Expand Up @@ -1126,6 +1130,7 @@ public final class org/partiql/ast/Expr$Var$Companion {
public final class org/partiql/ast/Expr$Var$Scope : java/lang/Enum {
public static final field DEFAULT Lorg/partiql/ast/Expr$Var$Scope;
public static final field LOCAL Lorg/partiql/ast/Expr$Var$Scope;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Expr$Var$Scope;
public static fun values ()[Lorg/partiql/ast/Expr$Var$Scope;
}
Expand Down Expand Up @@ -1160,6 +1165,7 @@ public final class org/partiql/ast/Expr$Window$Companion {
public final class org/partiql/ast/Expr$Window$Function : java/lang/Enum {
public static final field LAG Lorg/partiql/ast/Expr$Window$Function;
public static final field LEAD Lorg/partiql/ast/Expr$Window$Function;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Expr$Window$Function;
public static fun values ()[Lorg/partiql/ast/Expr$Window$Function;
}
Expand Down Expand Up @@ -1224,6 +1230,7 @@ public final class org/partiql/ast/From$Join$Type : java/lang/Enum {
public static final field LEFT_OUTER Lorg/partiql/ast/From$Join$Type;
public static final field RIGHT Lorg/partiql/ast/From$Join$Type;
public static final field RIGHT_OUTER Lorg/partiql/ast/From$Join$Type;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/From$Join$Type;
public static fun values ()[Lorg/partiql/ast/From$Join$Type;
}
Expand Down Expand Up @@ -1258,6 +1265,7 @@ public final class org/partiql/ast/From$Value$Companion {
public final class org/partiql/ast/From$Value$Type : java/lang/Enum {
public static final field SCAN Lorg/partiql/ast/From$Value$Type;
public static final field UNPIVOT Lorg/partiql/ast/From$Value$Type;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/From$Value$Type;
public static fun values ()[Lorg/partiql/ast/From$Value$Type;
}
Expand Down Expand Up @@ -1291,6 +1299,7 @@ public final class org/partiql/ast/GraphMatch$Direction : java/lang/Enum {
public static final field RIGHT Lorg/partiql/ast/GraphMatch$Direction;
public static final field UNDIRECTED Lorg/partiql/ast/GraphMatch$Direction;
public static final field UNDIRECTED_OR_RIGHT Lorg/partiql/ast/GraphMatch$Direction;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/GraphMatch$Direction;
public static fun values ()[Lorg/partiql/ast/GraphMatch$Direction;
}
Expand Down Expand Up @@ -1525,6 +1534,7 @@ public final class org/partiql/ast/GraphMatch$Restrictor : java/lang/Enum {
public static final field ACYCLIC Lorg/partiql/ast/GraphMatch$Restrictor;
public static final field SIMPLE Lorg/partiql/ast/GraphMatch$Restrictor;
public static final field TRAIL Lorg/partiql/ast/GraphMatch$Restrictor;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/GraphMatch$Restrictor;
public static fun values ()[Lorg/partiql/ast/GraphMatch$Restrictor;
}
Expand Down Expand Up @@ -1700,6 +1710,7 @@ public final class org/partiql/ast/GroupBy$Key$Companion {
public final class org/partiql/ast/GroupBy$Strategy : java/lang/Enum {
public static final field FULL Lorg/partiql/ast/GroupBy$Strategy;
public static final field PARTIAL Lorg/partiql/ast/GroupBy$Strategy;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/GroupBy$Strategy;
public static fun values ()[Lorg/partiql/ast/GroupBy$Strategy;
}
Expand All @@ -1711,6 +1722,7 @@ public abstract class org/partiql/ast/Identifier : org/partiql/ast/AstNode {
public final class org/partiql/ast/Identifier$CaseSensitivity : java/lang/Enum {
public static final field INSENSITIVE Lorg/partiql/ast/Identifier$CaseSensitivity;
public static final field SENSITIVE Lorg/partiql/ast/Identifier$CaseSensitivity;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Identifier$CaseSensitivity;
public static fun values ()[Lorg/partiql/ast/Identifier$CaseSensitivity;
}
Expand Down Expand Up @@ -2094,13 +2106,15 @@ public final class org/partiql/ast/SetOp$Type : java/lang/Enum {
public static final field EXCEPT Lorg/partiql/ast/SetOp$Type;
public static final field INTERSECT Lorg/partiql/ast/SetOp$Type;
public static final field UNION Lorg/partiql/ast/SetOp$Type;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/SetOp$Type;
public static fun values ()[Lorg/partiql/ast/SetOp$Type;
}

public final class org/partiql/ast/SetQuantifier : java/lang/Enum {
public static final field ALL Lorg/partiql/ast/SetQuantifier;
public static final field DISTINCT Lorg/partiql/ast/SetQuantifier;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/SetQuantifier;
public static fun values ()[Lorg/partiql/ast/SetQuantifier;
}
Expand Down Expand Up @@ -2131,13 +2145,15 @@ public final class org/partiql/ast/Sort$Companion {
public final class org/partiql/ast/Sort$Dir : java/lang/Enum {
public static final field ASC Lorg/partiql/ast/Sort$Dir;
public static final field DESC Lorg/partiql/ast/Sort$Dir;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Sort$Dir;
public static fun values ()[Lorg/partiql/ast/Sort$Dir;
}

public final class org/partiql/ast/Sort$Nulls : java/lang/Enum {
public static final field FIRST Lorg/partiql/ast/Sort$Nulls;
public static final field LAST Lorg/partiql/ast/Sort$Nulls;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/Sort$Nulls;
public static fun values ()[Lorg/partiql/ast/Sort$Nulls;
}
Expand Down Expand Up @@ -5304,6 +5320,7 @@ public final class org/partiql/ast/sql/SqlLayout$Indent$Type : java/lang/Enum {
public static final field SPACE Lorg/partiql/ast/sql/SqlLayout$Indent$Type;
public static final field TAB Lorg/partiql/ast/sql/SqlLayout$Indent$Type;
public final fun getChar ()C
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/ast/sql/SqlLayout$Indent$Type;
public static fun values ()[Lorg/partiql/ast/sql/SqlLayout$Indent$Type;
}
Expand Down
2 changes: 1 addition & 1 deletion partiql-ast/src/main/kotlin/org/partiql/ast/helpers/ToLegacyAst.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi

override fun visitLetBinding(node: Let.Binding, ctx: Ctx) = translate(node) { metas ->
val expr = visitExpr(node.expr, ctx)
val name = node.asAlias?.symbol
val name = node.asAlias.symbol
letBinding(expr, name, metas)
}

Expand Down
1 change: 1 addition & 0 deletions partiql-eval/api/partiql-eval.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public final class org/partiql/eval/PartiQLEngine$Companion {
public final class org/partiql/eval/PartiQLEngine$Mode : java/lang/Enum {
public static final field PERMISSIVE Lorg/partiql/eval/PartiQLEngine$Mode;
public static final field STRICT Lorg/partiql/eval/PartiQLEngine$Mode;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lorg/partiql/eval/PartiQLEngine$Mode;
public static fun values ()[Lorg/partiql/eval/PartiQLEngine$Mode;
}
Expand Down
Loading

0 comments on commit 15e48a0

Please sign in to comment.