diff --git a/build.gradle.kts b/build.gradle.kts index 75f03ad726..1187114f41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -319,3 +319,16 @@ kotlinPublications { } } } + +tasks.assemble { + // subprojects use the Gradle version from the root project, so let's sync them to ensure standalone version will build as well. + doLast { + val source = file("gradle/wrapper/gradle-wrapper.properties") + listOf("examples/android-example", "examples/kotlin-dataframe-plugin-example").forEach { sub -> + val target = file("$sub/gradle/wrapper/gradle-wrapper.properties") + if (source.readText() != target.readText()) { + source.copyTo(target, overwrite = true) + } + } + } +} diff --git a/examples/android-example/README.md b/examples/android-example/README.md index 41b6c8a203..c862ce4b85 100644 --- a/examples/android-example/README.md +++ b/examples/android-example/README.md @@ -8,6 +8,8 @@ A minimal Android project showcasing integration with **Kotlin DataFrame**. It also includes the [Kotlin DataFrame Compiler Plugin](https://kotlin.github.io/dataframe/compiler-plugin.html). -> **Note:** The generated [extension properties](https://kotlin.github.io/dataframe/extensionpropertiesapi.html) -> may not be highlighted correctly in current stable versions of Android Studio due to limited IDE support. -> However, they work as expected at runtime and during compilation. +We recommend using an up-to-date Android Studio for the best experience. +For proper functionality in Android Studio requires version Otter | 2025.2.2 or newer. + +[Download Android Example](https://github.com/Kotlin/dataframe/raw/example-projects-archives/android-example.zip) + diff --git a/examples/android-example/app/build.gradle.kts b/examples/android-example/app/build.gradle.kts index c2d5514fe0..c1ddf459e8 100644 --- a/examples/android-example/app/build.gradle.kts +++ b/examples/android-example/app/build.gradle.kts @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) // DataFrame Compiler plugin, matching the Kotlin version diff --git a/examples/android-example/gradle/libs.versions.toml b/examples/android-example/gradle/libs.versions.toml index 66e7696276..8435f8064f 100644 --- a/examples/android-example/gradle/libs.versions.toml +++ b/examples/android-example/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.11.1" +agp = "9.0.0-beta04" kotlin = "2.3.0-RC2" coreKtx = "1.10.1" junit = "4.13.2" diff --git a/examples/android-example/gradle/wrapper/gradle-wrapper.properties b/examples/android-example/gradle/wrapper/gradle-wrapper.properties index c3c884d289..2e1113280e 100644 --- a/examples/android-example/gradle/wrapper/gradle-wrapper.properties +++ b/examples/android-example/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri Jul 25 14:30:49 AMT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/kotlin-dataframe-plugin-example/README.md b/examples/kotlin-dataframe-plugin-example/README.md index faeda0bf1f..6f2d80eaa5 100644 --- a/examples/kotlin-dataframe-plugin-example/README.md +++ b/examples/kotlin-dataframe-plugin-example/README.md @@ -6,5 +6,7 @@ An IntelliJ IDEA project demonstrating the use of the > **Note:** This project uses **dev versions** of the Kotlin and the Kotlin DataFrame plugin. > See [build.gradle.kts](build.gradle.kts) for details. -For proper functionality in IntelliJ IDEA requires version 2025.2 or higher -(Currently available only in [IntelliJ IDEA EAP](https://www.jetbrains.com/idea/nextversion/?_gl=1*1ojxffu*_gcl_au*MTk5NzUwODYzOS4xNzQ2NzkxMDMz*_ga*MTE0ODQ1MzY3OS4xNzM4OTY1NzM3*_ga_9J976DJZ68*czE3NDkyMTM4MzkkbzE5OCRnMSR0MTc0OTIxMzg0MSRqNTgkbDAkaDA.)). +We recommend using an up-to-date IntelliJ IDEA for the best experience. +For proper functionality in IntelliJ IDEA requires version 2025.2 or newer. + +[Download Kotlin DataFrame Compiler Plugin Example](https://github.com/Kotlin/dataframe/raw/example-projects-archives/kotlin-dataframe-plugin-example.zip) diff --git a/examples/kotlin-dataframe-plugin-example/gradle/wrapper/gradle-wrapper.jar b/examples/kotlin-dataframe-plugin-example/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..e708b1c023 Binary files /dev/null and b/examples/kotlin-dataframe-plugin-example/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/kotlin-dataframe-plugin-example/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin-dataframe-plugin-example/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..2e1113280e --- /dev/null +++ b/examples/kotlin-dataframe-plugin-example/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e188b8..2e1113280e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME