Jetpack compose [skip ci]

Author: LZRS

build.gradle.kts

@@ -13,6 +13,8 @@ buildscript {
     classpath(Plugins.kotlinGradlePlugin)
     classpath(Plugins.navSafeArgsGradlePlugin)
     classpath(Plugins.rulerGradlePlugin)
+    classpath(Plugins.kotlinComposePlugin)
+    classpath(Plugins.kotlinSerializationPlugin)
   }
 }
 

buildSrc/src/main/kotlin/Plugins.kt

@@ -23,7 +23,9 @@ object Plugins {
     const val dokka = "org.jetbrains.dokka"
     const val kotlin = "kotlin"
     const val kotlinAndroid = "kotlin-android"
+    const val kotlinCompose = "org.jetbrains.kotlin.plugin.compose"
     const val kotlinKsp = "com.google.devtools.ksp"
+    const val kotlinSerialization = "org.jetbrains.kotlin.plugin.serialization"
     const val mavenPublish = "maven-publish"
     const val fladle = "com.osacky.fladle"
     const val navSafeArgs = "androidx.navigation.safeargs.kotlin"
@@ -37,6 +39,8 @@ object Plugins {
   const val benchmarkGradlePlugin =
     "androidx.benchmark:benchmark-gradle-plugin:${Versions.benchmarkPlugin}"
   const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
+  const val kotlinComposePlugin = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:${Versions.kotlin}"
+  const val kotlinSerializationPlugin = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:${Versions.kotlin}"
   const val navSafeArgsGradlePlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
   const val rulerGradlePlugin = "com.spotify.ruler:ruler-gradle-plugin:1.2.1"
   const val flankGradlePlugin = "com.osacky.flank.gradle:fladle:0.17.4"

demo/build.gradle.kts

@@ -50,7 +50,7 @@ dependencies {
   implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.fragment)
   implementation(libs.androidx.lifecycle.livedata)
-  implementation(libs.androidx.lifecycle.runtime)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
   implementation(libs.androidx.lifecycle.viewmodel)
   implementation(libs.androidx.navigation.fragment)
   implementation(libs.androidx.navigation.ui)

engine/benchmarks/app/build.gradle.kts

@@ -1,7 +1,8 @@
 plugins {
     id(Plugins.BuildPlugins.application)
     id(Plugins.BuildPlugins.kotlinAndroid)
-    id(Plugins.BuildPlugins.navSafeArgs)
+    id(Plugins.BuildPlugins.kotlinCompose)
+    id(Plugins.BuildPlugins.kotlinSerialization)
 }
 
 android {
@@ -14,6 +15,7 @@ android {
         targetSdk = Sdk.TARGET_SDK
         versionCode = 1
         versionName = "1.0"
+
         testInstrumentationRunner = Dependencies.androidJunitRunner
     }
 
@@ -34,33 +36,43 @@ android {
         }
     }
     compileOptions {
-        // Flag to enable support for the new language APIs
-        // See https://developer.android.com/studio/write/java8-support
         isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    buildFeatures {
+        compose = true
     }
-
-    kotlin { jvmToolchain(11) }
 
     packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
+
+    kotlin { jvmToolchain(11) }
 }
 
 dependencies {
     coreLibraryDesugaring(Dependencies.desugarJdkLibs)
-    implementation(libs.androidx.activity)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.datastore.preferences)
-    implementation(libs.androidx.fragment)
-    implementation(libs.androidx.lifecycle.livedata)
-    implementation(libs.androidx.lifecycle.runtime)
-    implementation(libs.androidx.lifecycle.viewmodel)
-    implementation(libs.androidx.profileinstaller)
-    implementation(libs.androidx.work.runtime)
-    implementation(libs.bundles.androidx.tracing)
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.material)
     implementation(project(":engine"))
 
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.lifecycle.viewmodel.savedstate)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.bundles.androidx.tracing)
+    implementation(libs.kotlinx.serialization.json)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
 }

engine/benchmarks/app/src/androidTest/java/com/google/android/fhir/engine/benchmarks/app/ExampleInstrumentedTest.kt

@@ -0,0 +1,22 @@
+package com.google.android.fhir.engine.benchmarks.app
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        Assert.assertEquals("com.google.android.fhir.engine", appContext.packageName)
+    }
+}

engine/benchmarks/app/src/main/AndroidManifest.xml

@@ -5,22 +5,23 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".BenchmarkApplication"
+        android:name=".MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.Androidfhir">
 
         <profileable
             android:shell="true"
             tools:targetApi="29" />
 
         <activity
-            android:name=".BenchmarkActivity"
-            android:exported="true">
+            android:name=".MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.Androidfhir">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />