bumping and fixing android example

Jolanrensen · Jolanrensen · commit fdc9143ebaa5 · 2026-07-08T14:44:39.000+02:00
diff --git a/examples/projects/android-example/app/build.gradle.kts b/examples/projects/android-example/app/build.gradle.kts
@@ -3,19 +3,20 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.ktlint.gradle)
 
     // DataFrame Compiler plugin, matching the Kotlin version
     alias(libs.plugins.dataframe)
 }
 
 android {
     namespace = "com.example.myapplication"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.example.myapplication"
-        minSdk = 21
-        targetSdk = 36
+        minSdk = 23
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 
diff --git a/examples/projects/android-example/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt b/examples/projects/android-example/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.example.myapplication
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.myapplication", appContext.packageName)
     }
-}
+}
diff --git a/examples/projects/android-example/app/src/main/java/com/example/myapplication/MainActivity.kt b/examples/projects/android-example/app/src/main/java/com/example/myapplication/MainActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:function-naming")
+
 package com.example.myapplication
 
 import android.os.Bundle
@@ -30,10 +32,7 @@ import org.jetbrains.kotlinx.dataframe.api.filter
 import org.jetbrains.kotlinx.dataframe.api.rows
 
 @DataSchema
-data class Person(
-    val age: Int,
-    val name: String
-)
+data class Person(val age: Int, val name: String)
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -42,7 +41,7 @@ class MainActivity : ComponentActivity() {
 
         val df = dataFrameOf(
             "name" to listOf("Andrei", "Nikita", "Jolan"),
-            "age" to listOf(22, 16, 37)
+            "age" to listOf(22, 16, 37),
         ).cast<Person>()
 
         setContent {
@@ -60,7 +59,7 @@ class MainActivity : ComponentActivity() {
 fun DefaultDataFrameScreenPreview() {
     val df = dataFrameOf(
         "name" to listOf("Andrei", "Nikita", "Jolan"),
-        "age" to listOf(22, 16, 37)
+        "age" to listOf(22, 16, 37),
     ).cast<Person>()
     DataFrameScreen(df)
 }
@@ -71,19 +70,19 @@ fun DataFrameScreen(df: DataFrame<Person>) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(top = 48.dp, start = 16.dp, end = 16.dp)
+            .padding(top = 48.dp, start = 16.dp, end = 16.dp),
     ) {
         Text(
             text = "Kotlin DataFrame on Android",
             style = MaterialTheme.typography.headlineSmall,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         Text(
             text = "df",
             modifier = Modifier
                 .background(color = Color.LightGray)
-                .padding(2.dp)
+                .padding(2.dp),
         )
 
         DataFrameTable(df)
@@ -92,7 +91,7 @@ fun DataFrameScreen(df: DataFrame<Person>) {
             text = "df.filter { age >= 20 }",
             modifier = Modifier
                 .background(color = Color.LightGray)
-                .padding(2.dp)
+                .padding(2.dp),
         )
 
         DataFrameTable(filtered)
@@ -104,7 +103,7 @@ fun DataFrameScreen(df: DataFrame<Person>) {
 fun DefaultDataFrameTablePreview() {
     val df = dataFrameOf(
         "name" to listOf("Andrei", "Nikita", "Jolan"),
-        "age" to listOf(22, 16, 37)
+        "age" to listOf(22, 16, 37),
     ).cast<Person>()
     DataFrameTable(df)
 }
@@ -124,7 +123,7 @@ fun DataFrameTable(df: DataFrame<*>) {
                         modifier = Modifier
                             .weight(1f)
                             .padding(4.dp),
-                        style = MaterialTheme.typography.labelLarge
+                        style = MaterialTheme.typography.labelLarge,
                     )
                 }
             }
@@ -139,7 +138,7 @@ fun DataFrameTable(df: DataFrame<*>) {
                         text = cell.toString(),
                         modifier = Modifier
                             .weight(1f)
-                            .padding(4.dp)
+                            .padding(4.dp),
                     )
                 }
             }
diff --git a/examples/projects/android-example/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt b/examples/projects/android-example/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.example.myapplication
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
@@ -14,4 +13,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}
diff --git a/examples/projects/android-example/gradle/libs.versions.toml b/examples/projects/android-example/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "9.0.0"
+agp = "9.2.1"
 kotlin = "2.4.0"
 dataframe = "1.0.0-Beta5"
 ktlint-gradle = "14.2.0"
diff --git a/examples/projects/dev/android-example/app/build.gradle.kts b/examples/projects/dev/android-example/app/build.gradle.kts
@@ -3,19 +3,20 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.ktlint.gradle)
 
     // DataFrame Compiler plugin, matching the Kotlin version
     alias(libs.plugins.dataframe)
 }
 
 android {
     namespace = "com.example.myapplication"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.example.myapplication"
-        minSdk = 21
-        targetSdk = 36
+        minSdk = 23
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 
diff --git a/examples/projects/dev/android-example/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt b/examples/projects/dev/android-example/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.example.myapplication
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.myapplication", appContext.packageName)
     }
-}
+}
diff --git a/examples/projects/dev/android-example/app/src/main/java/com/example/myapplication/MainActivity.kt b/examples/projects/dev/android-example/app/src/main/java/com/example/myapplication/MainActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:function-naming")
+
 package com.example.myapplication
 
 import android.os.Bundle
@@ -30,10 +32,7 @@ import org.jetbrains.kotlinx.dataframe.api.filter
 import org.jetbrains.kotlinx.dataframe.api.rows
 
 @DataSchema
-data class Person(
-    val age: Int,
-    val name: String
-)
+data class Person(val age: Int, val name: String)
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -42,7 +41,7 @@ class MainActivity : ComponentActivity() {
 
         val df = dataFrameOf(
             "name" to listOf("Andrei", "Nikita", "Jolan"),
-            "age" to listOf(22, 16, 37)
+            "age" to listOf(22, 16, 37),
         ).cast<Person>()
 
         setContent {
@@ -60,7 +59,7 @@ class MainActivity : ComponentActivity() {
 fun DefaultDataFrameScreenPreview() {
     val df = dataFrameOf(
         "name" to listOf("Andrei", "Nikita", "Jolan"),
-        "age" to listOf(22, 16, 37)
+        "age" to listOf(22, 16, 37),
     ).cast<Person>()
     DataFrameScreen(df)
 }
@@ -71,19 +70,19 @@ fun DataFrameScreen(df: DataFrame<Person>) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(top = 48.dp, start = 16.dp, end = 16.dp)
+            .padding(top = 48.dp, start = 16.dp, end = 16.dp),
     ) {
         Text(
             text = "Kotlin DataFrame on Android",
             style = MaterialTheme.typography.headlineSmall,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         Text(
             text = "df",
             modifier = Modifier
                 .background(color = Color.LightGray)
-                .padding(2.dp)
+                .padding(2.dp),
         )
 
         DataFrameTable(df)
@@ -92,7 +91,7 @@ fun DataFrameScreen(df: DataFrame<Person>) {
             text = "df.filter { age >= 20 }",
             modifier = Modifier
                 .background(color = Color.LightGray)
-                .padding(2.dp)
+                .padding(2.dp),
         )
 
         DataFrameTable(filtered)
@@ -104,7 +103,7 @@ fun DataFrameScreen(df: DataFrame<Person>) {
 fun DefaultDataFrameTablePreview() {
     val df = dataFrameOf(
         "name" to listOf("Andrei", "Nikita", "Jolan"),
-        "age" to listOf(22, 16, 37)
+        "age" to listOf(22, 16, 37),
     ).cast<Person>()
     DataFrameTable(df)
 }
@@ -124,7 +123,7 @@ fun DataFrameTable(df: DataFrame<*>) {
                         modifier = Modifier
                             .weight(1f)
                             .padding(4.dp),
-                        style = MaterialTheme.typography.labelLarge
+                        style = MaterialTheme.typography.labelLarge,
                     )
                 }
             }
@@ -139,7 +138,7 @@ fun DataFrameTable(df: DataFrame<*>) {
                         text = cell.toString(),
                         modifier = Modifier
                             .weight(1f)
-                            .padding(4.dp)
+                            .padding(4.dp),
                     )
                 }
             }
diff --git a/examples/projects/dev/android-example/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt b/examples/projects/dev/android-example/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.example.myapplication
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
@@ -14,4 +13,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}
diff --git a/examples/projects/dev/android-example/gradle/libs.versions.toml b/examples/projects/dev/android-example/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "9.0.0"
+agp = "9.2.1"
 kotlin = "2.4.0"
 dataframe = "1.0.0-Beta5"
 ktlint-gradle = "14.2.0"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -88,7 +88,7 @@ spark4 = "4.1.2"
 multik = "0.3.1"
 
 # Used by the Android example project; keys mirror examples/projects/android-example/gradle/libs.versions.toml
-agp = "9.0.0"
+agp = "9.2.1"
 coreKtx = "1.19.0"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`package com.example.myapplication`
`2`	`2`
	`3`	`+import org.junit.Assert.assertEquals`
`3`	`4`	`import org.junit.Test`
`4`	`5`
`5`		`-import org.junit.Assert.*`
`6`		`-`
`7`	`6`	`/**`
`8`	`7`	`* Example local unit test, which will execute on the development machine (host).`
`9`	`8`	`*`
`@@ -14,4 +13,4 @@ class ExampleUnitTest {`
`14`	`13`	`fun addition_isCorrect() {`
`15`	`14`	`assertEquals(4, 2 + 2)`
`16`	`15`	`}`
`17`		`-}`
	`16`	`+}`