chore: kotlin native build fixes

sureshg · sureshg · commit 9be9392ec353 · 2024-02-05T09:47:58.000-08:00
diff --git a/README.md b/README.md
@@ -170,42 +170,38 @@ $ actionlint
     'theme': 'base'
   }
 }%%
+
 graph LR
-    subgraph backend
-        jvm
-        native
-    end
-    subgraph web
-        js
-        wasm
-    end
-    subgraph compose
-        desktop
-        compose-web
-    end
-    subgraph dep-mgmt
-        bom
-        catalog
-    end
-    subgraph meta
-        compiler
-        ksp
-    end
-    subgraph compiler
-        compiler
-        plugin
-    end
-    subgraph ksp
-        ksp
-        processor
-    end
-    plugin --> shared
-    web --> shared
-    desktop --> shared
-    native --> shared
-    processor --> shared
-    jvm --> shared
-    jvm --> js
-    jvm --> wasm
-    benchmark --> shared
+  subgraph backend
+    jvm
+    data
+    native
+  end
+  subgraph meta
+    compiler
+    ksp
+  end
+  subgraph compiler
+    compiler
+    plugin
+  end
+  subgraph ksp
+    ksp
+    processor
+  end
+  subgraph web
+    wasm
+    js
+  end
+  plugin --> shared
+  wasm --> shared
+  benchmark --> shared
+  data --> shared
+  native --> shared
+  processor --> shared
+  jvm --> shared
+  jvm --> data
+  jvm --> js
+  jvm --> wasm
+  js --> shared
 ```
diff --git a/backend/README.md b/backend/README.md
@@ -3,13 +3,6 @@
 ```bash
 # JVM
 $ ./gradlew :backend:jvm:run
-
-# Native
-$ ./gradlew :backend:native:macOsUniversalBinary
-
-# Container
-$ ./gradlew :backend:native:jibDockerBuild
-$ docker run -it --rm sureshg/native
 ```
 
 ### Misc
diff --git a/backend/jvm/build.gradle.kts b/backend/jvm/build.gradle.kts
@@ -33,11 +33,16 @@ exposedCodeGeneratorConfig { outputDirectory.set(file("src/main/kotlin/dev/sures
 jib {
   from {
     image = "openjdk:${javaVersion.get().majorVersion}-slim"
+
     platforms {
       platform {
         architecture = "arm64"
         os = "linux"
       }
+      platform {
+        architecture = "arm64"
+        os = "linux"
+      }
     }
   }
 
diff --git a/backend/native/build.gradle.kts b/backend/native/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.github.ajalt.mordant.rendering.TextColors
 import com.google.cloud.tools.jib.gradle.extension.nativeimage.JibNativeImageExtension
+import common.githubRepo
 import common.githubUser
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
@@ -37,10 +38,6 @@ jib {
         architecture = "amd64"
         os = "linux"
       }
-      // platform {
-      //   architecture = "arm64"
-      //   os = "linux"
-      // }
     }
   }
 
@@ -55,7 +52,23 @@ jib {
       properties = mapOf("imageName" to "app")
     }
   }
-  container { mainClass = "MainKt" }
+
+  container {
+    ports = listOf("8080", "9898")
+    args = listOf(project.name, project.version.toString())
+    labels =
+        mapOf(
+            "maintainer" to project.githubUser,
+            "org.opencontainers.image.authors" to project.githubUser,
+            "org.opencontainers.image.title" to project.name,
+            "org.opencontainers.image.description" to "🐳 ${project.description}",
+            "org.opencontainers.image.version" to project.version.toString(),
+            "org.opencontainers.image.vendor" to project.githubUser,
+            "org.opencontainers.image.url" to project.githubRepo,
+            "org.opencontainers.image.source" to project.githubRepo,
+            "org.opencontainers.image.licenses" to "Apache-2.0")
+    mainClass = "MainKt"
+  }
 }
 
 // Workaround for Jib
diff --git a/gradle/build-logic/src/main/kotlin/common/MultiPlatformExtns.kt b/gradle/build-logic/src/main/kotlin/common/MultiPlatformExtns.kt
@@ -50,7 +50,6 @@ fun KotlinMultiplatformExtension.commonTarget() {
         api(libs.kotlinx.html)
         api(libs.kotlin.bignum)
         api(libs.kotlin.bignum.serialization)
-        // TODO: Remove this once Ktor get WASM support
         if (project.name != "wasm") {
           api(libs.ktor.client.core)
           api(libs.ktor.client.content.negotiation)
diff --git a/gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt b/gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt
@@ -251,7 +251,7 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
             // "-Djdk.lang.Process.launchMechanism=vfork",
             // "-Djdk.tls.maxCertificateChainLength=10",
             // "-Djdk.tls.maxHandshakeMessageSize=32768",
-            // "-Djdk.virtualThreadScheduler.parallelism=",
+            // "-Djdk.virtualThreadScheduler.parallelism=10",
             // "-Djdk.virtualThreadScheduler.maxPoolSize=256",
             // "--add-exports=java.management/sun.management=ALL-UNNAMED",
             // "--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED",
@@ -418,7 +418,7 @@ fun LanguageSettingsBuilder.configureKotlinLang() {
   optIn("kotlin.ExperimentalMultiplatform")
   optIn("kotlin.js.ExperimentalJsExport")
   optIn("kotlin.experimental.ExperimentalNativeApi")
-  // optIn("kotlinx.cinterop.ExperimentalForeignApi")
+  optIn("kotlinx.cinterop.ExperimentalForeignApi")
   // optIn("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
 }
 
diff --git a/gradle/build-logic/src/main/kotlin/common/Repo.kt b/gradle/build-logic/src/main/kotlin/common/Repo.kt
@@ -12,17 +12,10 @@ object Repo {
 
   const val YARN = "https://github.com/yarnpkg/yarn/releases/download/"
 
-  const val KOTLIN_NATIVE = "https://download.jetbrains.com/kotlin/native/builds/"
-
   const val COMPOSE_MULTIPLATFORM_DEV = "https://maven.pkg.jetbrains.space/public/p/compose/dev"
 
   const val KOBWEB = "https://us-central1-maven.pkg.dev/varabyte-repos/public"
 
-  const val JETPACK_COMPOSE = "https://androidx.dev/storage/compose-compiler/repository"
-
-  const val KOTLIN_WASM_EXPERIMENTAL =
-      "https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental"
-
   /** The GitHub username */
   val GITHUB_USER = System.getenv("GITHUB_USER").orEmpty()
 
diff --git a/gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts b/gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts
@@ -67,10 +67,7 @@ ksp {
 
 // kotlinPowerAssert { functions = listOf("kotlin.assert", "kotlin.test.assertTrue") }
 
-redacted {
-  enabled = false
-  replacementString = "█"
-}
+redacted { replacementString = "█" }
 
 kover {
   // useJacoco()
diff --git a/gradle/build-logic/src/main/kotlin/plugins/kotlin.mpp.gradle.kts b/gradle/build-logic/src/main/kotlin/plugins/kotlin.mpp.gradle.kts
@@ -69,10 +69,7 @@ atomicfu {
 
 // kotlinPowerAssert { functions = listOf("kotlin.assert", "kotlin.test.assertTrue") }
 
-redacted {
-  enabled = false
-  replacementString = "█"
-}
+redacted { replacementString = "█" }
 
 kover {
   // useJacoco()
diff --git a/gradle/build-logic/src/main/kotlin/settings/repos.settings.gradle.kts b/gradle/build-logic/src/main/kotlin/settings/repos.settings.gradle.kts
@@ -51,7 +51,6 @@ plugins {
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
-    kotlinNative()
     nodeJS()
     yarn()
     composeMultiplatformDev()
@@ -60,34 +59,6 @@ dependencyResolutionManagement {
   repositoriesMode = RepositoriesMode.PREFER_SETTINGS
 }
 
-// Workaround for https://youtrack.jetbrains.com/issue/KT-51379
-fun RepositoryHandler.kotlinNative() {
-  exclusiveContent {
-    forRepository {
-      ivy(Repo.KOTLIN_NATIVE) {
-        name = "Kotlin Native"
-        patternLayout {
-          // Download URLs:
-          // https://download.jetbrains.com/kotlin/native/builds/releases/1.9.20/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.9.20.tar.gz
-          listOf(
-                  "macos-x86_64",
-                  "macos-aarch64",
-                  "linux-x86_64",
-                  "windows-x86_64",
-              )
-              .forEach { os ->
-                listOf("dev", "releases").forEach { stage ->
-                  artifact("$stage/[revision]/$os/[artifact]-[revision].[ext]")
-                }
-              }
-        }
-        metadataSources { artifact() }
-      }
-    }
-    filter { includeModuleByRegex(".*", ".*kotlin-native-prebuilt.*") }
-  }
-}
-
 fun RepositoryHandler.nodeJS() {
   exclusiveContent {
     forRepository {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlin-jvmtarget               = "21"
 kotlin-dsl-jvmtarget           = "21"
 kotlin-api-version             = "1.9"
 kotlin-lang-version            = "2.0"
-gradle                         = "8.6-rc-4"
+gradle                         = "8.6"
 node-version                   = "21.6.0"
 java-vendor                    = "Oracle"
 java-jvmArguments              = "--enable-preview"
@@ -35,7 +35,7 @@ kotlinx-metadata               = "0.9.0"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bincompat              = "0.14.0"
 kotlin-wrappers                = "1.0.0-pre.693"
-kotlin-redacted                = "1.7.1"
+kotlin-redacted                = "1.8.0-alpha01"
 kotlinx-multik                 = "0.2.2"
 kotlinx-dataframe              = "0.12.1"
 kotlinx-kandy                  = "0.5.0"
@@ -56,7 +56,7 @@ intellij-markdown              = "0.6.1"
 jgit                           = "6.5.0.202303070854-r"
 jte                            = "3.1.9"
 jimfs                          = "1.3.0"
-junit                          = "5.10.1"
+junit                          = "5.10.2"
 koin                           = "3.4.1"
 kotest                         = "5.7.1"
 mockk                          = "1.13.9"
@@ -140,7 +140,7 @@ dependency-analysis            = "1.29.0"
 best-practices-plugin          = "0.10"
 graalvm-nativeimage            = "0.10.0"
 github-depgraph                = "0.1.0"
-github-changelog               = "2.0.0"
+github-changelog               = "2.2.0"
 wire-plugin                    = "4.8.0"
 poko-plugin                    = "0.15.1"
 buildkonfig                    = "0.13.3"
diff --git 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-8.6-rc-4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,3 @@
-import common.Platform
-
 pluginManagement { includeBuild("gradle/build-logic") }
 
 plugins { id("settings.repos") }
@@ -24,15 +22,13 @@ include(":meta:compiler:plugin")
 
 include(":backend:jvm")
 
-include(":backend:data")
+include(
+    ":backend:data")
 
+// include(":backend:native")
 // include(":compose:web")
 // include(":compose:desktop")
 
-if (Platform.isUnix) {
-  // include(":backend:native")
-}
-
 // includeBuild("misc/build") {
 //    dependencySubstitution {
 //        substitute(module("dev.suresh:misc-build")).using(project(":"))
diff --git a/shared/src/nativeMain/resources/common-native-res.txt b/shared/src/nativeMain/resources/common-native-res.txt

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,16 @@ exposedCodeGeneratorConfig { outputDirectory.set(file("src/main/kotlin/dev/sures`
`33`	`33`	`jib {`
`34`	`34`	`from {`
`35`	`35`	`image = "openjdk:${javaVersion.get().majorVersion}-slim"`
	`36`	`+`
`36`	`37`	`platforms {`
`37`	`38`	`platform {`
`38`	`39`	`architecture = "arm64"`
`39`	`40`	`os = "linux"`
`40`	`41`	`}`
	`42`	`+ platform {`
	`43`	`+ architecture = "arm64"`
	`44`	`+ os = "linux"`
	`45`	`+ }`
`41`	`46`	`}`
`42`	`47`	`}`
`43`	`48`