Skip to content

Commit 1e2be37

Browse files
committed
adapted android example, removing arrow from the examples
1 parent a6b435d commit 1e2be37

File tree

2 files changed

+19
-63
lines changed

2 files changed

+19
-63
lines changed

docs/StardustDocs/topics/setup/SetupAndroid.md

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ but you can add the Kotlin DataFrame JVM dependency to your Android project with
2222

2323
```kotlin
2424
dependencies {
25-
implementation("org.jetbrains.kotlinx:dataframe:%dataFrameVersion%")
25+
// Core Kotlin DataFrame API & JSON IO.
26+
// See custom Gradle setup:
27+
// https://kotlin.github.io/dataframe/setupcustomgradle.html
28+
implementation("org.jetbrains.kotlinx:dataframe-core:%dataFrameVersion%")
29+
implementation("org.jetbrains.kotlinx:dataframe-json:%dataFrameVersion%")
30+
// You can add any additional IO modules you like, except for 'dataframe-arrow'.
31+
// Apache Arrow is not supported well on Android.
2632
}
2733

2834
android {
@@ -38,25 +44,6 @@ android {
3844
kotlinOptions {
3945
jvmTarget = "1.8"
4046
}
41-
packaging {
42-
resources {
43-
pickFirsts += listOf(
44-
"META-INF/AL2.0",
45-
"META-INF/LGPL2.1",
46-
"META-INF/ASL-2.0.txt",
47-
"META-INF/LICENSE.md",
48-
"META-INF/NOTICE.md",
49-
"META-INF/LGPL-3.0.txt",
50-
"META-INF/thirdparty-LICENSE",
51-
)
52-
excludes += listOf(
53-
"META-INF/kotlin-jupyter-libraries/libraries.json",
54-
"META-INF/{INDEX.LIST,DEPENDENCIES}",
55-
"{draftv3,draftv4}/schema",
56-
"arrow-git.properties",
57-
)
58-
}
59-
}
6047
}
6148
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
6249
kotlinOptions.jvmTarget = "1.8"
@@ -69,7 +56,13 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
6956

7057
```groovy
7158
dependencies {
72-
implementation 'org.jetbrains.kotlinx:dataframe:%dataFrameVersion%'
59+
// Core Kotlin DataFrame API & JSON IO.
60+
// See custom Gradle setup:
61+
// https://kotlin.github.io/dataframe/setupcustomgradle.html
62+
implementation 'org.jetbrains.kotlinx:dataframe-core:%dataFrameVersion%'
63+
implementation 'org.jetbrains.kotlinx:dataframe-json:%dataFrameVersion%'
64+
// You can add any additional IO modules you like, except for 'dataframe-arrow'.
65+
// Apache Arrow is not supported well on Android.
7366
}
7467
7568
android {
@@ -85,25 +78,6 @@ android {
8578
kotlinOptions {
8679
jvmTarget = "1.8"
8780
}
88-
packaging {
89-
resources {
90-
pickFirsts += [
91-
"META-INF/AL2.0",
92-
"META-INF/LGPL2.1",
93-
"META-INF/ASL-2.0.txt",
94-
"META-INF/LICENSE.md",
95-
"META-INF/NOTICE.md",
96-
"META-INF/LGPL-3.0.txt",
97-
"META-INF/thirdparty-LICENSE",
98-
]
99-
excludes += [
100-
"META-INF/kotlin-jupyter-libraries/libraries.json",
101-
"META-INF/{INDEX.LIST,DEPENDENCIES}",
102-
"{draftv3,draftv4}/schema",
103-
"arrow-git.properties",
104-
]
105-
}
106-
}
10781
}
10882
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
10983
kotlinOptions.jvmTarget = "1.8"
@@ -113,9 +87,8 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
11387
</tab>
11488
</tabs>
11589

116-
This setup adds the [general Kotlin DataFrame dependency](Modules.md#dataframe-general),
117-
which includes the [core API and implementation](Modules.md#dataframe-core)
118-
as well as all [IO modules](Modules.md#io-modules)
90+
This setup adds the [Kotlin DataFrame core](Modules.md#dataframe-core)
91+
as well as a subset of the [IO modules](Modules.md#io-modules)
11992
(excluding [experimental ones](Modules.md#experimental-modules)).
12093
For flexible configuration, see [Custom configuration](SetupCustomGradle.md).
12194

examples/android-example/app/build.gradle.kts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121

2222
buildTypes {
2323
release {
24-
isMinifyEnabled = false
24+
isMinifyEnabled = true
2525
proguardFiles(
2626
getDefaultProguardFile("proguard-android-optimize.txt"),
2727
"proguard-rules.pro"
@@ -38,25 +38,6 @@ android {
3838
buildFeatures {
3939
compose = true
4040
}
41-
packaging {
42-
resources {
43-
pickFirsts += listOf(
44-
"META-INF/AL2.0",
45-
"META-INF/LGPL2.1",
46-
"META-INF/ASL-2.0.txt",
47-
"META-INF/LICENSE.md",
48-
"META-INF/NOTICE.md",
49-
"META-INF/LGPL-3.0.txt",
50-
"META-INF/thirdparty-LICENSE",
51-
)
52-
excludes += listOf(
53-
"META-INF/kotlin-jupyter-libraries/libraries.json",
54-
"META-INF/{INDEX.LIST,DEPENDENCIES}",
55-
"{draftv3,draftv4}/schema",
56-
"arrow-git.properties",
57-
)
58-
}
59-
}
6041
}
6142

6243
dependencies {
@@ -83,4 +64,6 @@ dependencies {
8364
// https://kotlin.github.io/dataframe/setupcustomgradle.html
8465
implementation("org.jetbrains.kotlinx:dataframe-core:1.0.0-dev-7831")
8566
implementation("org.jetbrains.kotlinx:dataframe-json:1.0.0-dev-7831")
67+
// You can add any additional IO modules you like, except for 'dataframe-arrow'.
68+
// Apache Arrow is not supported well on Android.
8669
}

0 commit comments

Comments
 (0)