exclude jakarta, wrote docs in readme for android

Author: Jolanrensen

README.md

@@ -38,6 +38,32 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlinx:dataframe:0.10.0")
 }
+
+// Below only applies to Android projects
+android {
+    defaultConfig {
+        minSdk = 26 // Android O+
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    packaging {
+        resources {
+            // These exclusions are needed for the dataframe-arrow and dataframe-openapi dependencies
+            excludes += listOf(
+                "META-INF/kotlin-jupyter-libraries/libraries.json",
+                "META-INF/{AL2.0,LGPL2.1,ASL-2.0.txt,INDEX.LIST,DEPENDENCIES,LICENSE.md,NOTICE.md,LGPL-3.0.txt}",
+                "{draftv3,draftv4}/schema",
+                "arrow-git.properties",
+            )
+        }
+    }
+}
+tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "1.8" }
 ```
 ### Jupyter Notebook
 

dataframe-openapi/build.gradle.kts

@@ -22,7 +22,10 @@ dependencies {
 
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlinpoet)
-    api(libs.swagger)
+    api(libs.swagger) {
+        // Fix for Android
+        exclude("jakarta.validation")
+    }
 
     testApi(project(":core"))
     testImplementation(libs.junit)

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

@@ -2,13 +2,20 @@ package org.jetbrains.dataframe.gradle
 
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
+import org.intellij.lang.annotations.Language
 import java.io.File
 import java.nio.file.Files
 
-fun runGradleBuild(task: String, build: (File) -> String): Build {
+fun runGradleBuild(
+    task: String,
+    @Language("kts") settingsGradle: (File) -> String = { "" },
+    build: (File) -> String,
+): Build {
     val buildDir = Files.createTempDirectory("test").toFile()
     val buildFile = File(buildDir, "build.gradle.kts")
     buildFile.writeText(build(buildDir))
+    val settingsFile = File(buildDir, "settings.gradle.kts")
+    settingsFile.writeText(settingsGradle(buildDir))
     return Build(buildDir, gradleRunner(buildDir, task).build())
 }
 

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

@@ -5,6 +5,7 @@ import io.kotest.inspectors.forOne
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import org.gradle.testkit.runner.TaskOutcome
+import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.junit.Test
 import java.io.File
@@ -19,6 +20,7 @@ internal class SchemaGeneratorPluginTest {
     @Test
     fun `plugin configured via configure`() {
         val (_, result) = runGradleBuild(":generateDataFrameTest") {
+            // language=kts
             """
             import java.net.URL
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension    
@@ -47,6 +49,7 @@ internal class SchemaGeneratorPluginTest {
     @Test
     fun `plugin configured via extension DSL`() {
         val (_, result) = runGradleBuild(":generateDataFrameTest") {
+            // language=kts
             """
             import java.net.URL
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension    
@@ -77,6 +80,7 @@ internal class SchemaGeneratorPluginTest {
         val buildDir = Files.createTempDirectory("test").toFile()
         val buildFile = File(buildDir, "build.gradle")
         buildFile.writeText(
+            // language=groovy
             """
                 import java.net.URL
                 import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension    
@@ -108,6 +112,7 @@ internal class SchemaGeneratorPluginTest {
         val buildDir = Files.createTempDirectory("test").toFile()
         val buildFile = File(buildDir, "build.gradle")
         buildFile.writeText(
+            // language=groovy
             """
                 import java.net.URL
                 import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension    
@@ -138,6 +143,7 @@ internal class SchemaGeneratorPluginTest {
     @Test
     fun `plugin configure multiple schemas from URLs via extension`() {
         val (_, result) = runGradleBuild(":generateDataFrames") {
+            // language=kts
             """
             import java.net.URL
             
@@ -178,6 +184,7 @@ internal class SchemaGeneratorPluginTest {
                 File(it, TestData.csvName).writeText(TestData.csvSample)
                 File(it, TestData.jsonName).writeText(TestData.jsonSample)
             }
+            // language=kts
             """
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension 
                
@@ -213,6 +220,7 @@ internal class SchemaGeneratorPluginTest {
         val (_, result) = runGradleBuild(":generateDataFrameTest") { buildDir ->
             val dataDir = File(buildDir, "data").also { it.mkdirs() }
             File(dataDir, TestData.jsonName).writeText(TestData.jsonSample)
+            // language=kts
             """
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension 
                
@@ -243,6 +251,7 @@ internal class SchemaGeneratorPluginTest {
             val dataDir = File(buildDir, "data").also { it.mkdirs() }
             val file = File(dataDir, TestData.jsonName).also { it.writeText(TestData.jsonSample) }
             val absolutePath = file.absolutePath.replace(File.separatorChar, '/')
+            // language=kts
             """
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension 
                
@@ -271,6 +280,7 @@ internal class SchemaGeneratorPluginTest {
     fun `data is string and url`() {
         val (_, result) = runGradleBuild(":generateDataFrameTest") { buildDir ->
             println("Build dir: $buildDir")
+            // language=kts
             """
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension 
                
@@ -299,6 +309,7 @@ internal class SchemaGeneratorPluginTest {
     fun `data is OpenApi string and url`() {
         val (_, result) = runGradleBuild(":generateDataFrameTest") { buildDir ->
             println("Build dir: $buildDir")
+            // language=kts
             """
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension 
                
@@ -334,6 +345,7 @@ internal class SchemaGeneratorPluginTest {
                 1;2;3
                 """.trimIndent()
             )
+            // language=kts
             """
             import org.jetbrains.dataframe.gradle.SchemaGeneratorExtension 
                

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

@@ -3,9 +3,6 @@ package org.jetbrains.dataframe.gradle
 import io.kotest.assertions.asClue
 import io.kotest.inspectors.forAny
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.string.shouldEndWith
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.testfixtures.ProjectBuilder
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension