Skip to content

Commit 39c4fa6

Browse files
committed
Update Gradle to 9.0
Our old Gradle plugin requires Kotlin 2.2.0 in Gradle runtime to work, because ParseKt refers to the new kotlin.time.Instant class Removing SimpleGit because it's for now incompatible with 9.0
1 parent 295fe51 commit 39c4fa6

File tree

8 files changed

+7
-85
lines changed

8 files changed

+7
-85
lines changed

core/api/core.api

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6581,8 +6581,6 @@ public final class org/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords : j
65816581
public static final field EXTERNAL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
65826582
public static final field FINAL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
65836583
public static final field FUN Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6584-
public static final field HEADER Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6585-
public static final field IMPL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
65866584
public static final field IN Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
65876585
public static final field INFIX Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
65886586
public static final field INLINE Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
@@ -6636,8 +6634,6 @@ public final class org/jetbrains/kotlinx/dataframe/keywords/SoftKeywords : java/
66366634
public static final field FINAL Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
66376635
public static final field FINALLY Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
66386636
public static final field GET Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6639-
public static final field HEADER Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6640-
public static final field IMPL Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
66416637
public static final field IMPORT Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
66426638
public static final field INFIX Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
66436639
public static final field INIT Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;

core/build.gradle.kts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import nl.jolanrensen.kodex.gradle.creatingRunKodexTask
55
import org.gradle.jvm.tasks.Jar
66
import org.gradle.kotlin.dsl.withType
77
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
8-
import xyz.ronella.gradle.plugin.simple.git.task.GitTask
98

109
plugins {
1110
with(libs.plugins) {
@@ -16,7 +15,6 @@ plugins {
1615
// alias(kover)
1716
alias(ktlint)
1817
alias(kodex)
19-
alias(simpleGit)
2018
alias(buildconfig)
2119
alias(binary.compatibility.validator)
2220

@@ -152,23 +150,13 @@ val clearSamplesOutputs by tasks.registering {
152150
}
153151
}
154152

155-
val addSamplesToGit by tasks.registering(GitTask::class, fun GitTask.() {
156-
directory = file(".")
157-
command = "add"
158-
args = listOf("-A", "../docs/StardustDocs/resources/snippets")
159-
})
160-
161153
val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
162154
group = "documentation"
163155
mainClass = "org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt"
164156

165157
dependsOn(clearSamplesOutputs)
166158
dependsOn(samplesTest)
167159
classpath = sourceSets.test.get().runtimeClasspath
168-
169-
doLast {
170-
addSamplesToGit.get().executeCommand()
171-
}
172160
}
173161

174162
tasks.withType<KorroTask> {

examples/kotlin-dataframe-plugin-example/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import org.jlleitschuh.gradle.ktlint.KtlintExtension
22

33
plugins {
44
id("org.jlleitschuh.gradle.ktlint") version "12.3.0"
5-
kotlin("jvm") version "2.2.20-dev-3524"
6-
kotlin("plugin.dataframe") version "2.2.20-dev-3524"
5+
kotlin("jvm") version "2.2.20-Beta2"
6+
kotlin("plugin.dataframe") version "2.2.20-Beta2"
77
}
88

99
group = "org.example"

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[versions]
2-
ksp = "2.2.0-2.0.2"
2+
ksp = "2.2.20-Beta2-2.0.2"
33
kotlinJupyter = "0.15.0-587"
44

55
ktlint = "12.3.0"
66

7-
# make sure to sync both manually with :generator module
8-
kotlin = "2.2.0" # needs jupyter compatibility with Kotlin 2.1 to update
7+
kotlin = "2.2.20-Beta2"
8+
# make sure to sync manually with :generator module
99
kotlinpoet = "2.2.0"
1010

1111
dokka = "2.0.0"
1212
libsPublisher = "2.2.0-dev-61"
1313

1414
# "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
1515
# dogfood Gradle / KSP plugins in tests and idea-examples modules
16-
dataframe = "1.0.0-dev-6538"
16+
dataframe = "1.0.0-dev-8314"
1717
korro = "0.1.6"
1818

1919
binaryCompatibilityValidator = "0.17.0"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/SourceSetsExpectationsTest.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,4 @@ class SourceSetsExpectationsTest {
2929
it.sourceSets.findByName("jvmMain") shouldBe null
3030
}
3131
}
32-
33-
@Test
34-
fun `there is main in android project`() {
35-
val project = makeProject()
36-
project.plugins.apply("com.android.application")
37-
project.plugins.apply("org.jetbrains.kotlin.android")
38-
project.extensions.getByType(KotlinAndroidProjectExtension::class.java).let { extension ->
39-
val main = extension.sourceSets.getByName("main")
40-
main.kotlin.sourceDirectories.toList().asClue { files ->
41-
files.forAny { it.shouldEndWith("src", "main", "java") }
42-
files.forAny { it.shouldEndWith("src", "main", "kotlin") }
43-
}
44-
}
45-
}
4632
}

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/taskProperties/TaskDataSchemaPropertyTest.kt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,4 @@ class TaskDataSchemaPropertyTest {
3535
.dataSchema.get()
3636
.shouldBe(project.file("build/generated/dataframe/main1/kotlin/org/example/my/321.Generated.kt"))
3737
}
38-
39-
@Test
40-
fun `extension sourceSet present in android project`() {
41-
val project = makeProject()
42-
project.plugins.apply(SchemaGeneratorPlugin::class.java)
43-
project.plugins.apply("com.android.application")
44-
project.plugins.apply("org.jetbrains.kotlin.android")
45-
(project.extensions.getByName("android") as BaseAppModuleExtension).let {
46-
it.compileSdk = 30
47-
}
48-
project.extensions.getByType(KotlinAndroidProjectExtension::class.java).apply {
49-
sourceSets.create("main1")
50-
}
51-
project.extensions.getByType(SchemaGeneratorExtension::class.java).apply {
52-
sourceSet = "main1"
53-
schema {
54-
data = "123"
55-
name = "org.example.my.321"
56-
}
57-
}
58-
shouldNotThrow<ProjectConfigurationException> {
59-
project.evaluate()
60-
}
61-
(project.tasks.getByName("generateDataFrame321") as GenerateDataSchemaTask)
62-
.dataSchema.get()
63-
.shouldBe(project.file("build/generated/dataframe/main1/kotlin/org/example/my/321.Generated.kt"))
64-
}
6538
}

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/taskProperties/TaskPackageNamePropertyTest.kt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -113,27 +113,6 @@ class TaskPackageNamePropertyTest {
113113
.packageName.get() shouldBe "org.test.dataframe"
114114
}
115115

116-
@Test
117-
fun `task infers packageName from directory structure on android`() {
118-
val project = makeProject()
119-
project.plugins.apply(SchemaGeneratorPlugin::class.java)
120-
project.plugins.apply("com.android.application")
121-
project.plugins.apply("org.jetbrains.kotlin.android")
122-
(project.extensions.getByName("android") as BaseAppModuleExtension).let {
123-
it.compileSdk = 30
124-
}
125-
File(project.projectDir, "/src/main/kotlin/org/test/").also { it.mkdirs() }
126-
project.extensions.getByType(SchemaGeneratorExtension::class.java).apply {
127-
schema {
128-
data = "123"
129-
name = "321"
130-
}
131-
}
132-
project.evaluate()
133-
(project.tasks.getByName("generateDataFrame321") as GenerateDataSchemaTask)
134-
.packageName.get() shouldBe "org.test.dataframe"
135-
}
136-
137116
@Test
138117
fun `task will not add _dataframe_ if inferred package ends with _dataframe_`() {
139118
val project = makeProject()

0 commit comments

Comments
 (0)