Skip to content

Commit 6b490ad

Browse files
gabrielfeogabrielfeo
authored
Restore compatibility with older Kotlin versions (#434)
Fixes compatibility with Kotlin/Jupyter versions 0.12.0.322 and older* (tracked in #426) by downgrading the language version the library is compiled for to 1.8. The library was previously compiled for 1.9, which was compatible with these Kotlin/Jupyter versions, then upgraded to Kotlin Gradle plugin 2.x, causing Kotlin/Jupyter versions still on compiler 1.9.x to no longer support running the library. This patch broadens compatibility beyond what was initially supported by downgrading to language version 1.8. Also addresses compatibility with projects using the library as part of a Gradle plugin, in which the embedded Kotlin compiler version in Gradle >=8.2 will only support libraries compiled for language version >=1.8. Reported in #404. *Further Kotlin/Jupyter versions between 0.12.0.322 and 0.14.1.514 are probably incompatible as well, depending on when Kotlin/Jupyter upgraded its compiler version to 2.x.
1 parent 1a3ae94 commit 6b490ad

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

‎library/api/library.api

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ public final class com/gabrielfeo/develocity/api/model/BuildModelName : java/lan
513513
public static final field npmAttributes Lcom/gabrielfeo/develocity/api/model/BuildModelName;
514514
public static final field pythonAttributes Lcom/gabrielfeo/develocity/api/model/BuildModelName;
515515
public static final field sbtAttributes Lcom/gabrielfeo/develocity/api/model/BuildModelName;
516-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
517516
public final fun getValue ()Ljava/lang/String;
518517
public fun toString ()Ljava/lang/String;
519518
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/BuildModelName;
@@ -1177,15 +1176,13 @@ public final class com/gabrielfeo/develocity/api/model/GradleArtifactTransformEx
11771176
public static final field executedNotCacheable Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$AvoidanceOutcome;
11781177
public static final field executedUnknownCacheability Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$AvoidanceOutcome;
11791178
public static final field skipped Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$AvoidanceOutcome;
1180-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
11811179
public final fun getValue ()Ljava/lang/String;
11821180
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$AvoidanceOutcome;
11831181
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$AvoidanceOutcome;
11841182
}
11851183

11861184
public final class com/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$CacheArtifactRejectedReason : java/lang/Enum {
11871185
public static final field artifactSizeTooLarge Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$CacheArtifactRejectedReason;
1188-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
11891186
public final fun getValue ()Ljava/lang/String;
11901187
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$CacheArtifactRejectedReason;
11911188
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$CacheArtifactRejectedReason;
@@ -1196,7 +1193,6 @@ public final class com/gabrielfeo/develocity/api/model/GradleArtifactTransformEx
11961193
public static final field disabledToEnsureCorrectness Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$NonCacheabilityCategory;
11971194
public static final field notCacheable Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$NonCacheabilityCategory;
11981195
public static final field unknown Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$NonCacheabilityCategory;
1199-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
12001196
public final fun getValue ()Ljava/lang/String;
12011197
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$NonCacheabilityCategory;
12021198
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$NonCacheabilityCategory;
@@ -1209,7 +1205,6 @@ public final class com/gabrielfeo/develocity/api/model/GradleArtifactTransformEx
12091205
public static final field success Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$Outcome;
12101206
public static final field unknown Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$Outcome;
12111207
public static final field upToDate Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$Outcome;
1212-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
12131208
public final fun getValue ()Ljava/lang/String;
12141209
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$Outcome;
12151210
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleArtifactTransformExecutionEntry$Outcome;
@@ -1465,15 +1460,13 @@ public final class com/gabrielfeo/develocity/api/model/GradleBuildCachePerforman
14651460
public static final field lifecycle Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$AvoidanceOutcome;
14661461
public static final field noMinusSource Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$AvoidanceOutcome;
14671462
public static final field skipped Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$AvoidanceOutcome;
1468-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
14691463
public final fun getValue ()Ljava/lang/String;
14701464
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$AvoidanceOutcome;
14711465
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$AvoidanceOutcome;
14721466
}
14731467

14741468
public final class com/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$CacheArtifactRejectedReason : java/lang/Enum {
14751469
public static final field artifactSizeTooLarge Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$CacheArtifactRejectedReason;
1476-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
14771470
public final fun getValue ()Ljava/lang/String;
14781471
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$CacheArtifactRejectedReason;
14791472
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$CacheArtifactRejectedReason;
@@ -1494,7 +1487,6 @@ public final class com/gabrielfeo/develocity/api/model/GradleBuildCachePerforman
14941487
public static final field taskHasNoActions Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$NonCacheabilityCategory;
14951488
public static final field taskOutputCachingNotEnabled Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$NonCacheabilityCategory;
14961489
public static final field unknown Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$NonCacheabilityCategory;
1497-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
14981490
public final fun getValue ()Ljava/lang/String;
14991491
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$NonCacheabilityCategory;
15001492
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleBuildCachePerformanceTaskExecutionEntry$NonCacheabilityCategory;
@@ -1687,7 +1679,6 @@ public final class com/gabrielfeo/develocity/api/model/GradleConfigurationCacheR
16871679
public static final field failed Lcom/gabrielfeo/develocity/api/model/GradleConfigurationCacheResult$Outcome;
16881680
public static final field hit Lcom/gabrielfeo/develocity/api/model/GradleConfigurationCacheResult$Outcome;
16891681
public static final field miss Lcom/gabrielfeo/develocity/api/model/GradleConfigurationCacheResult$Outcome;
1690-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
16911682
public final fun getValue ()Ljava/lang/String;
16921683
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleConfigurationCacheResult$Outcome;
16931684
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleConfigurationCacheResult$Outcome;
@@ -1784,7 +1775,6 @@ public final class com/gabrielfeo/develocity/api/model/GradleDeprecationOwner$Ty
17841775
public static final field script Lcom/gabrielfeo/develocity/api/model/GradleDeprecationOwner$Type;
17851776
public static final field task Lcom/gabrielfeo/develocity/api/model/GradleDeprecationOwner$Type;
17861777
public static final field unknown Lcom/gabrielfeo/develocity/api/model/GradleDeprecationOwner$Type;
1787-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
17881778
public final fun getValue ()Ljava/lang/String;
17891779
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/GradleDeprecationOwner$Type;
17901780
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/GradleDeprecationOwner$Type;
@@ -2208,15 +2198,13 @@ public final class com/gabrielfeo/develocity/api/model/MavenBuildCachePerformanc
22082198
public static final field executedNotCacheable Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$AvoidanceOutcome;
22092199
public static final field executedUnknownCacheability Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$AvoidanceOutcome;
22102200
public static final field skipped Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$AvoidanceOutcome;
2211-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
22122201
public final fun getValue ()Ljava/lang/String;
22132202
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$AvoidanceOutcome;
22142203
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$AvoidanceOutcome;
22152204
}
22162205

22172206
public final class com/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$CacheArtifactRejectedReason : java/lang/Enum {
22182207
public static final field artifactSizeTooLarge Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$CacheArtifactRejectedReason;
2219-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
22202208
public final fun getValue ()Ljava/lang/String;
22212209
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$CacheArtifactRejectedReason;
22222210
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$CacheArtifactRejectedReason;
@@ -2233,7 +2221,6 @@ public final class com/gabrielfeo/develocity/api/model/MavenBuildCachePerformanc
22332221
public static final field offlineBuild Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$NonCacheabilityCategory;
22342222
public static final field unknown Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$NonCacheabilityCategory;
22352223
public static final field unknownEntitlements Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$NonCacheabilityCategory;
2236-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
22372224
public final fun getValue ()Ljava/lang/String;
22382225
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$NonCacheabilityCategory;
22392226
public static fun values ()[Lcom/gabrielfeo/develocity/api/model/MavenBuildCachePerformanceGoalExecutionEntry$NonCacheabilityCategory;
@@ -2971,7 +2958,6 @@ public final class com/gabrielfeo/develocity/api/model/TestAccelerationFeatureUs
29712958
public static final field disabled Lcom/gabrielfeo/develocity/api/model/TestAccelerationFeatureUsageStatus;
29722959
public static final field enabled Lcom/gabrielfeo/develocity/api/model/TestAccelerationFeatureUsageStatus;
29732960
public static final field unavailable Lcom/gabrielfeo/develocity/api/model/TestAccelerationFeatureUsageStatus;
2974-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
29752961
public final fun getValue ()Ljava/lang/String;
29762962
public fun toString ()Ljava/lang/String;
29772963
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/TestAccelerationFeatureUsageStatus;
@@ -3169,7 +3155,6 @@ public final class com/gabrielfeo/develocity/api/model/TestIncludeFields : java/
31693155
public static final field BUILD_SCAN_IDS Lcom/gabrielfeo/develocity/api/model/TestIncludeFields;
31703156
public static final field Companion Lcom/gabrielfeo/develocity/api/model/TestIncludeFields$Companion;
31713157
public static final field WORK_UNITS Lcom/gabrielfeo/develocity/api/model/TestIncludeFields;
3172-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
31733158
public final fun getValue ()Ljava/lang/String;
31743159
public fun toString ()Ljava/lang/String;
31753160
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/TestIncludeFields;
@@ -3206,7 +3191,6 @@ public final class com/gabrielfeo/develocity/api/model/TestOutcome : java/lang/E
32063191
public static final field notSelected Lcom/gabrielfeo/develocity/api/model/TestOutcome;
32073192
public static final field passed Lcom/gabrielfeo/develocity/api/model/TestOutcome;
32083193
public static final field skipped Lcom/gabrielfeo/develocity/api/model/TestOutcome;
3209-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
32103194
public final fun getValue ()Ljava/lang/String;
32113195
public fun toString ()Ljava/lang/String;
32123196
public static fun valueOf (Ljava/lang/String;)Lcom/gabrielfeo/develocity/api/model/TestOutcome;

‎library/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3+
14
plugins {
25
id("com.gabrielfeo.published-kotlin-jvm-library")
36
id("com.gabrielfeo.develocity-api-code-generation")
@@ -93,3 +96,9 @@ publishing {
9396
}
9497
}
9598
}
99+
100+
tasks.named("compileKotlin", KotlinCompile::class) {
101+
compilerOptions {
102+
languageVersion = KotlinVersion.KOTLIN_1_8
103+
}
104+
}

0 commit comments

Comments
 (0)