File tree Expand file tree Collapse file tree 8 files changed +7
-85
lines changed
examples/kotlin-dataframe-plugin-example
plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle Expand file tree Collapse file tree 8 files changed +7
-85
lines changed Original file line number Diff line number Diff line change @@ -6581,8 +6581,6 @@ public final class org/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords : j
6581
6581
public static final field EXTERNAL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6582
6582
public static final field FINAL Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6583
6583
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;
6586
6584
public static final field IN Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6587
6585
public static final field INFIX Lorg/jetbrains/kotlinx/dataframe/keywords/ModifierKeywords;
6588
6586
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/
6636
6634
public static final field FINAL Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6637
6635
public static final field FINALLY Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6638
6636
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;
6641
6637
public static final field IMPORT Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6642
6638
public static final field INFIX Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
6643
6639
public static final field INIT Lorg/jetbrains/kotlinx/dataframe/keywords/SoftKeywords;
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ import nl.jolanrensen.kodex.gradle.creatingRunKodexTask
5
5
import org.gradle.jvm.tasks.Jar
6
6
import org.gradle.kotlin.dsl.withType
7
7
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
8
- import xyz.ronella.gradle.plugin.simple.git.task.GitTask
9
8
10
9
plugins {
11
10
with (libs.plugins) {
@@ -16,7 +15,6 @@ plugins {
16
15
// alias(kover)
17
16
alias(ktlint)
18
17
alias(kodex)
19
- alias(simpleGit)
20
18
alias(buildconfig)
21
19
alias(binary.compatibility.validator)
22
20
@@ -152,23 +150,13 @@ val clearSamplesOutputs by tasks.registering {
152
150
}
153
151
}
154
152
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
-
161
153
val copySamplesOutputs = tasks.register<JavaExec >(" copySamplesOutputs" ) {
162
154
group = " documentation"
163
155
mainClass = " org.jetbrains.kotlinx.dataframe.explainer.SampleAggregatorKt"
164
156
165
157
dependsOn(clearSamplesOutputs)
166
158
dependsOn(samplesTest)
167
159
classpath = sourceSets.test.get().runtimeClasspath
168
-
169
- doLast {
170
- addSamplesToGit.get().executeCommand()
171
- }
172
160
}
173
161
174
162
tasks.withType<KorroTask > {
Original file line number Diff line number Diff line change @@ -2,8 +2,8 @@ import org.jlleitschuh.gradle.ktlint.KtlintExtension
2
2
3
3
plugins {
4
4
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 "
7
7
}
8
8
9
9
group = " org.example"
Original file line number Diff line number Diff line change 1
1
[versions ]
2
- ksp = " 2.2.0 -2.0.2"
2
+ ksp = " 2.2.20-Beta2 -2.0.2"
3
3
kotlinJupyter = " 0.15.0-587"
4
4
5
5
ktlint = " 12.3.0"
6
6
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
9
9
kotlinpoet = " 2.2.0"
10
10
11
11
dokka = " 2.0.0"
12
12
libsPublisher = " 2.2.0-dev-61"
13
13
14
14
# "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
15
15
# dogfood Gradle / KSP plugins in tests and idea-examples modules
16
- dataframe = " 1.0.0-dev-6538 "
16
+ dataframe = " 1.0.0-dev-8314 "
17
17
korro = " 0.1.6"
18
18
19
19
binaryCompatibilityValidator = " 0.17.0"
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
networkTimeout =10000
5
5
validateDistributionUrl =true
6
6
zipStoreBase =GRADLE_USER_HOME
Original file line number Diff line number Diff line change @@ -29,18 +29,4 @@ class SourceSetsExpectationsTest {
29
29
it.sourceSets.findByName(" jvmMain" ) shouldBe null
30
30
}
31
31
}
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
- }
46
32
}
Original file line number Diff line number Diff line change @@ -35,31 +35,4 @@ class TaskDataSchemaPropertyTest {
35
35
.dataSchema.get()
36
36
.shouldBe(project.file(" build/generated/dataframe/main1/kotlin/org/example/my/321.Generated.kt" ))
37
37
}
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
- }
65
38
}
Original file line number Diff line number Diff line change @@ -113,27 +113,6 @@ class TaskPackageNamePropertyTest {
113
113
.packageName.get() shouldBe " org.test.dataframe"
114
114
}
115
115
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
-
137
116
@Test
138
117
fun `task will not add _dataframe_ if inferred package ends with _dataframe_` () {
139
118
val project = makeProject()
You can’t perform that action at this time.
0 commit comments