New app architecture

README.md

@@ -95,7 +95,7 @@ JsonTree(
 
 ## Search
 
-JsonTree can be searched for keys and values by using the `searchState` parameter. The SearchState provides the following data about the current results. For an example on how to implement a search UI see the sample [here](sample/src/commonMain/kotlin/App.kt).
+JsonTree can be searched for keys and values by using the `searchState` parameter. The SearchState provides the following data about the current results. For an example on how to implement a search UI see the sample [here](shared/src/commonMain/kotlin/com/sebastianneubauer/jsontreesample/App.kt).
 
 - `query` - The string which should be searched in the JsonTree
 - `totalResults` - The total count of results for the query

androidApp/build.gradle.kts

@@ -22,7 +22,7 @@ android {
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
             // for testing only, don't do this in your app
             signingConfig = signingConfigs.getByName("debug")
@@ -39,7 +39,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":sample"))
+    implementation(project(":shared"))
     implementation(libs.androidx.activity.compose)
     implementation(libs.jb.compose.components.resources)
-}
+}

build.gradle.kts

@@ -9,6 +9,7 @@ buildscript {
 plugins {
     alias(libs.plugins.android.application).apply(false)
     alias(libs.plugins.kotlinMultiplatform).apply(false)
+    alias(libs.plugins.kotlinJvm).apply(false)
     alias(libs.plugins.compose).apply(false)
     alias(libs.plugins.compose.compiler).apply(false)
     alias(libs.plugins.publish).apply(false)
@@ -18,14 +19,16 @@ plugins {
 }
 
 apiValidation {
-    ignoredProjects.add("sample")
+    ignoredProjects.addAll(listOf("shared", "desktopApp", "webApp"))
 }
 
 val projectSource = file(projectDir)
 val configFiles = files("$rootDir/detekt/config.yml")
 val baselineFile = File("$rootDir/detekt/baseline.xml")
 val kotlinFiles = "**/*.kt"
-val sampleModuleFiles = "**/sample/**"
+val sharedModuleFiles = "**/shared/**"
+val desktopAppModuleFiles = "**/desktopApp/**"
+val webAppModuleFiles = "**/webApp/**"
 val resourceFiles = "**/resources/**"
 val buildFiles = "**/build/**"
 val testFiles = "**/commonTest/**"
@@ -57,15 +60,14 @@ tasks.register<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>("detektGene
     baseline.set(baselineFile)
     config.setFrom(configFiles)
     include(kotlinFiles)
-    exclude(sampleModuleFiles, resourceFiles, buildFiles, testFiles)
+    exclude(sharedModuleFiles, desktopAppModuleFiles, webAppModuleFiles, resourceFiles, buildFiles, testFiles)
 }
 
-
 tasks.withType<Detekt>().configureEach {
     include(kotlinFiles)
-    exclude(sampleModuleFiles, resourceFiles, buildFiles, testFiles)
+    exclude(sharedModuleFiles, desktopAppModuleFiles, webAppModuleFiles, resourceFiles, buildFiles, testFiles)
 }
 
 dependencies {
     detektPlugins(libs.detekt.formatting)
-}
+}

desktopApp/build.gradle.kts

@@ -0,0 +1,35 @@
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+
+plugins {
+    alias(libs.plugins.kotlinJvm)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
+}
+
+group = "com.sebastianneubauer.jsontreesample"
+version = "1.0"
+
+dependencies {
+    implementation(project(":shared"))
+    implementation(compose.desktop.currentOs)
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+compose.desktop {
+    application {
+        mainClass = "com.sebastianneubauer.jsontreesample.MainKt"
+        buildTypes.release {
+            proguard {
+                configurationFiles.from("compose-desktop.pro")
+            }
+        }
+        nativeDistributions {
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            packageName = "com.sebastianneubauer.jsontreesample"
+            packageVersion = "1.0.0"
+        }
+    }
+}

gradle/libs.versions.toml

@@ -42,6 +42,7 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 androidKotlinMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -175,7 +175,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n  echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n  exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :sample:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n  echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n  exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -323,7 +323,7 @@
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../sample/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = iosApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.3;
@@ -350,7 +350,7 @@
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../sample/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = iosApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.3;

iosApp/iosApp/ContentView.swift

@@ -1,6 +1,6 @@
 import UIKit
 import SwiftUI
-import Sample
+import Shared
 
 struct ComposeView: UIViewControllerRepresentable {
     func makeUIViewController(context: Context) -> UIViewController {

jsontree/build.gradle.kts

@@ -1,6 +1,5 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -81,4 +80,4 @@ kotlin {
             implementation(compose.desktop.currentOs)
         }
     }
-}
+}

settings.gradle.kts

@@ -13,5 +13,7 @@ dependencyResolutionManagement {
 }
 rootProject.name = "JsonTree"
 include(":jsontree")
-include(":sample")
+include(":shared")
 include(":androidApp")
+include(":desktopApp")
+include(":webApp")

sample/build.gradle.kts → shared/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -25,26 +24,22 @@ kotlin {
     listOf(
         iosX64(),
         iosArm64(),
-        iosSimulatorArm64()
+        iosSimulatorArm64(),
     ).forEach {
         it.binaries.framework {
-            baseName = "Sample"
+            baseName = "Shared"
             isStatic = true
         }
     }
 
     js {
-        outputModuleName = "jsontree"
         browser()
-        binaries.executable()
         useEsModules()
     }
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        outputModuleName = "jsontree"
         browser()
-        binaries.executable()
     }
 
     sourceSets {
@@ -66,32 +61,18 @@ kotlin {
         commonTest.dependencies {
             implementation(kotlin("test"))
         }
-
-        jvmMain.dependencies {
-            implementation(compose.desktop.currentOs)
-        }
     }
 
-    //https://kotlinlang.org/docs/native-objc-interop.html#export-of-kdoc-comments-to-generated-objective-c-headers
+    // https://kotlinlang.org/docs/native-objc-interop.html#export-of-kdoc-comments-to-generated-objective-c-headers
     targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget> {
-        compilations["main"].compilerOptions.options.freeCompilerArgs.add("-Xexport-kdoc")
+        compilations["main"]
+            .compilerOptions.options.freeCompilerArgs
+            .add("-Xexport-kdoc")
     }
 
     jvmToolchain(17)
 }
 
-compose.desktop {
-    application {
-        mainClass = "com.sebastianneubauer.jsontreesample.MainKt"
-        buildTypes.release {
-            proguard {
-                configurationFiles.from("compose-desktop.pro")
-            }
-        }
-        nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "com.sebastianneubauer.jsontreesample"
-            packageVersion = "1.0.0"
-        }
-    }
+compose.resources {
+    packageOfResClass = "com.sebastianneubauer.jsontreesample.shared.generated.resources"
 }