Merge aa5d9ed into 308fcd6

Author: milosmns

.github/workflows/build-ga.yaml

@@ -37,11 +37,14 @@ jobs:
       - name: Lint check
         run: ./gradlew ktlintCheck
 
-      - name: Build all flavors
+      - name: Build all targets
         run: ./gradlew assemble
 
-      - name: Run all tests
-        run: ./gradlew allTests
+      - name: Run JVM tests
+        run: ./gradlew jvmTest
+
+#      - name: Run Mac/Native tests
+#        run: ./gradlew macNativeTest
 
       - name: Prepare for Publishing
         run: ./gradlew prepareForPublish

.github/workflows/build-pr.yaml

@@ -37,11 +37,14 @@ jobs:
       - name: Lint check
         run: ./gradlew ktlintCheck
 
-      - name: Build all flavors
+      - name: Build all targets
         run: ./gradlew assemble
 
-      - name: Run all tests
-        run: ./gradlew allTests
+      - name: Run JVM tests
+        run: ./gradlew jvmTest
+
+#      - name: Run Mac/Native tests
+#        run: ./gradlew macNativeTest
 
       - name: Prepare for Publishing
         run: ./gradlew prepareForPublish

build.gradle.kts

@@ -9,12 +9,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
 
-// Kudos to @JMFayard for figuring out lots of KMP stuff!
-
 plugins {
   application
-  kotlin("multiplatform") version "1.8.+" // when replacing, search the whole file for "8"
-  kotlin("plugin.serialization") version "1.8.+"
+  kotlin("multiplatform") version "1.9.+" // when replacing, search the whole file for "9"
+  kotlin("plugin.serialization") version "1.9.+"
   id("com.apollographql.apollo3") version "4.+"
   id("com.github.johnrengelman.shadow") version "8.+"
   id("org.jlleitschuh.gradle.ktlint") version "11.+"
@@ -30,12 +28,16 @@ application {
   mainClass.set("MainKt")
 }
 
-group = Out.group
-version = Out.version
+val env = Env()
+val output = Output(env)
+val configurator = Configurator(env, output)
+
+group = output.group
+version = output.version
 
 kotlin {
-  val jvmTarget = Configurator.configureJvmTarget(this)
-  val nativeTarget = Configurator.configureNativeTarget(this)
+  val jvmTarget = configurator.configureJvmTarget(this)
+  val nativeTarget = configurator.configureNativeTarget(this)
 
   sourceSets {
 
@@ -44,14 +46,14 @@ kotlin {
         implementation(kotlin("stdlib-common"))
         implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.+")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.+")
-        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.+")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.+")
         implementation("io.ktor:ktor-client-core:2.3.+")
         implementation("io.ktor:ktor-client-auth:2.3.+")
         implementation("io.ktor:ktor-client-logging:2.3.+")
         implementation("io.ktor:ktor-client-serialization:2.3.+")
         implementation("io.ktor:ktor-client-content-negotiation:2.3.+")
         implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.+")
-        implementation("com.squareup.okio:okio:3.+")
+        implementation("com.squareup.okio:okio:3.4.+")
         implementation("net.mamoe.yamlkt:yamlkt:0.+")
         implementation("com.apollographql.apollo3:apollo-api:4.+")
         implementation("com.apollographql.apollo3:apollo-runtime:4.+")
@@ -62,7 +64,7 @@ kotlin {
       dependsOn(commonMain)
       dependencies {
         implementation(kotlin("test"))
-        implementation("com.squareup.okio:okio-fakefilesystem:3.+")
+        implementation("com.squareup.okio:okio-fakefilesystem:3.4.+")
         implementation("com.willowtreeapps.assertk:assertk:0.+")
       }
     }
@@ -122,7 +124,7 @@ kotlin {
 
     // make the JVM 'jar' task work
     withType<ShadowJar> {
-      archiveBaseName.set(Out.artifact)
+      archiveBaseName.set(output.artifact)
       archiveClassifier.set("")
       archiveVersion.set("")
 
@@ -138,8 +140,8 @@ kotlin {
     register<Copy>("prepareForPublish") {
       group = "distribution"
       description = "Prepare the project outputs for publishing"
-      val distributionsDir = Out.getDistributionsDir()
-      val artifactName = Out.artifact
+      val distributionsDir = output.getDistributionsDir()
+      val artifactName = output.artifact
 
       val dependentTasks = mutableListOf("shadowJar")
       if (nativeTarget != null) {
@@ -149,13 +151,13 @@ kotlin {
 
       // take native if available
       if (nativeTarget != null) {
-        from(Out.getBinaryDir(nativeTarget.name)) {
+        from(output.getBinaryDir(nativeTarget.name)) {
           include("$artifactName.kexe")
           rename { if (it.endsWith(".kexe")) artifactName else it }
         }
       }
       // take JAR anyway
-      from(Out.getJarDir()) {
+      from(output.getJarDir()) {
         include("$artifactName.jar")
       }
 
@@ -169,14 +171,14 @@ kotlin {
     register<Copy>("install") {
       group = "application"
       description = "Build the native executable and install it"
-      val installDir = Out.getInstallDir()
-      val artifactName = Out.artifact
+      val installDir = output.getInstallDir()
+      val artifactName = output.artifact
 
       if (nativeTarget == null) {
         // JVM: copy the file to the root directory
         dependsOn("shadowJar")
 
-        val jarDir = Out.getJarDir()
+        val jarDir = output.getJarDir()
         from(jarDir) {
           include("$artifactName.jar")
         }
@@ -189,7 +191,7 @@ kotlin {
         // Native: copy the file to the programs directory
         dependsOn("${nativeTarget.name}Binaries")
 
-        val binaryDir = Out.getBinaryDir(nativeTarget.name)
+        val binaryDir = output.getBinaryDir(nativeTarget.name)
         from(binaryDir) {
           include("$artifactName.kexe")
           rename { artifactName }
@@ -234,21 +236,21 @@ apollo {
 
 sqldelight {
   databases {
-    create(Out.artifact) {
-      packageName.set(Out.artifact)
+    create(output.artifact) {
+      packageName.set(output.artifact)
     }
   }
 }
 
 githubRelease {
-  val writeToken = OS.env("GITHUB_TOKEN", "<invalid>")
+  val writeToken = env.sysVar("GITHUB_TOKEN") { "<invalid>" }
   if (writeToken == "<invalid>") println("Set \$GITHUB_TOKEN to enable GitHub releases.")
 
-  val commitish = OS.env("GITHUB_SHA", default = "master")
-  val prNumber = OS.env("GITHUB_PR_NUMBER", default = "")
+  val commitish = env.sysVar("GITHUB_SHA") { "master" }
+  val prNumber = env.sysVar("GITHUB_PR_NUMBER")
   val buildMoment = LocalDateTime.now()
   val nowTag = buildMoment.toString("yyyy-MM-dd-HH-mm-ss")
-  val quality = OS.env("BUILD_QUALITY", default = "Development")
+  val quality = env.sysVar("BUILD_QUALITY") { "Development" }
   var directoryPrefix = ""
   var prNumberPrefix = ""
   var timestampSuffix = ""
@@ -266,12 +268,12 @@ githubRelease {
       timestampSuffix = "/$nowTag"
     }
   }
-  val tag = "${directoryPrefix}${prNumberPrefix}v${Out.version}$timestampSuffix"
-  val name = "[$quality] v${Out.version}"
+  val tag = "${directoryPrefix}${prNumberPrefix}v${output.version}$timestampSuffix"
+  val name = "[$quality] v${output.version}"
 
   token(writeToken)
-  owner(Out.repoOwner)
-  repo(Out.repoName)
+  owner(output.repoOwner)
+  repo(output.repoName)
   tagName(tag)
   releaseName(name)
   targetCommitish(commitish)
@@ -316,10 +318,10 @@ githubRelease {
     }
   )
 
-  val distributionsDir = Out.getDistributionsDir()
-  val jarFile = file("$distributionsDir/${Out.artifact}.jar")
+  val distributionsDir = output.getDistributionsDir()
+  val jarFile = file("$distributionsDir/${output.artifact}.jar")
   val configFile = file("src/commonMain/resources/sample.config.yaml")
-  val unixFile = file("$distributionsDir/${Out.artifact}")
+  val unixFile = file("$distributionsDir/${output.artifact}")
   val toInclude = mutableListOf(jarFile, configFile)
   if (unixFile.exists()) toInclude += unixFile
   releaseAssets(*toInclude.toTypedArray())
@@ -329,39 +331,44 @@ githubRelease {
 
 // region Utils
 
-object OS {
+class Env {
   enum class Platform(val targetName: String) { JVM("jvm"), MAC("macNative") }
   enum class Arch { X86, ARM }
 
   val currentPlatform = when {
-    prop("os.name") == "Mac OS X" -> Platform.MAC
+    sysProp("os.name") == "Mac OS X" -> Platform.MAC
     else -> Platform.JVM
   }
 
   val currentArch = when {
-    prop("os.arch") in setOf("arm64", "aarch64") -> Arch.ARM
+    sysProp("os.arch") in setOf("arm64", "aarch64") -> Arch.ARM
     else -> Arch.X86
   }
 
-  fun prop(name: String, default: String = "") = System.getProperty(name)
+  inline fun sysProp(name: String, default: () -> String = { "" }) = System.getProperty(name)
     .takeIf { !it.isNullOrBlank() }
-    ?: default
+    ?: default()
 
-  fun env(name: String, default: String) = System.getenv(name)
+  inline fun gradleProp(name: String, default: () -> String = { "" }) = providers.gradleProperty(name).orNull
     .takeIf { !it.isNullOrBlank() }
-    ?: default
+    ?: default()
+
+  inline fun sysVar(name: String, default: () -> String = { "" }) = System.getenv(name)
+    .takeIf { !it.isNullOrBlank() }
+    ?: default()
+
 }
 
-object Out {
-  val group = OS.env("PROJECT_GROUP", default = "xyz.marinkovic.milos")
-  val artifact = OS.env("PROJECT_ARTIFACT", default = "codestats")
-  val version = OS.env("PROJECT_VERSION", default = "0.3.0")
-  val repoOwner = OS.env("REPO_OWNER", default = "milosmns")
-  val repoName = OS.env("REPO_NAME", default = "code-stats")
+class Output(private val env: Env) {
+  val group = env.sysVar("PROJECT_GROUP") { env.gradleProp("config.group") }
+  val artifact = env.sysVar("PROJECT_ARTIFACT") { env.gradleProp("config.artifact") }
+  val version = env.sysVar("PROJECT_VERSION") { env.gradleProp("config.version") }
+  val repoOwner = env.sysVar("REPO_OWNER") { env.gradleProp("config.gitHubRepoOwner") }
+  val repoName = env.sysVar("REPO_NAME") { env.gradleProp("config.gitHubRepoName") }
 
-  fun getInstallDir() = when (OS.currentPlatform) {
-    OS.Platform.MAC -> "/usr/local/bin"
-    else -> OS.prop("user.dir")
+  fun getInstallDir() = when (env.currentPlatform) {
+    Env.Platform.MAC -> "/usr/local/bin"
+    else -> env.sysProp("user.dir")
   }.replace('/', File.separatorChar)
 
   fun getJarDir() = "build/libs"
@@ -374,10 +381,10 @@ object Out {
     .replace('/', File.separatorChar)
 }
 
-object Configurator {
+class Configurator(private val env: Env, private val output: Output) {
 
   fun configureJvmTarget(container: KotlinTargetContainerWithPresetFunctions) =
-    container.jvm(OS.Platform.JVM.targetName) {
+    container.jvm(Env.Platform.JVM.targetName) {
       compilations.all {
         kotlinOptions.jvmTarget = "17"
         compilerOptions.configure {
@@ -388,16 +395,16 @@ object Configurator {
     }
 
   fun configureNativeTarget(container: KotlinTargetContainerWithPresetFunctions) =
-    when (OS.currentPlatform) {
-      OS.Platform.MAC -> when (OS.currentArch) {
-        OS.Arch.X86 -> container.macosX64(OS.currentPlatform.targetName)
-        OS.Arch.ARM -> container.macosArm64(OS.currentPlatform.targetName)
+    when (env.currentPlatform) {
+      Env.Platform.MAC -> when (env.currentArch) {
+        Env.Arch.X86 -> container.macosX64(env.currentPlatform.targetName)
+        Env.Arch.ARM -> container.macosArm64(env.currentPlatform.targetName)
       }
 
       else -> null
     }?.also { target ->
       target.binaries {
-        executable(Out.artifact) {
+        executable(output.artifact) {
           entryPoint = "main"
         }
         all {

gradle.properties

@@ -1,4 +1,13 @@
+# Language properties
 kotlin.code.style=official
 kotlin.mpp.enableCInteropCommonization=true
 
+# Engine properties
 org.gradle.jvmargs=-Xmx4096m
+
+# Project properties
+config.group = xyz.marinkovic.milos
+config.artifact = codestats
+config.version = 0.4.0
+config.gitHubRepoOwner = milosmns
+config.gitHubRepoName = code-stats

src/commonMain/kotlin/Main.kt

@@ -1,4 +1,4 @@
-import calculator.di.provideCycleTimeCalculator
+import calculator.di.provideGenericLongMetricCalculators
 import components.data.TeamHistoryConfig
 import history.TeamHistory
 import history.github.di.provideGitHubHistory
@@ -24,24 +24,23 @@ fun main(): Unit = runBlocking {
   try {
     // NETWORK EXPERIMENTS
 //    println("Loading team history...")
-//    val fetchedUnsorted = mutableListOf<Repository>()
+//    val fetched = mutableListOf<Repository>()
 //    teamHistoryConfig.teams.forEach { team ->
 //      println("Loading for team ${team.title}...")
 //      team.discussionRepositories.forEach { repoName ->
 //        println("Loading discussion repository $repoName...")
-//        fetchedUnsorted += history.fetchRepository(repoName, includeCodeReviews = false, includeDiscussions = true)
+//        fetched += history.fetchRepository(repoName, includeCodeReviews = false, includeDiscussions = true)
 //      }
 //      team.codeRepositories.forEach { repoName ->
 //        println("Loading code repository $repoName...")
-//        fetchedUnsorted += history.fetchRepository(repoName, includeCodeReviews = true, includeDiscussions = false)
+//        fetched += history.fetchRepository(repoName, includeCodeReviews = true, includeDiscussions = false)
 //      }
 //    }
 
     // STORAGE EXPERIMENTS
-//    val storage = provideStoredHistory(teamHistoryConfig)
+    val storage = provideStoredHistory(teamHistoryConfig)
 //    storage.purgeAll()
 //    val storedUnsorted = mutableListOf<Repository>()
-//    val fetched = fetchedUnsorted.sorted()
 //    fetched.forEach {
 //      storage.storeRepositoryDeep(it)
 //      storedUnsorted += storage.fetchRepository(
@@ -50,9 +49,7 @@ fun main(): Unit = runBlocking {
 //        includeDiscussions = true,
 //      )
 //    }
-//    val stored = storedUnsorted.sorted()
 
-    val storage = provideStoredHistory(teamHistoryConfig)
     val stored = storage.fetchAllRepositories().map {
       storage.fetchRepository(
         it.name,
@@ -68,11 +65,12 @@ fun main(): Unit = runBlocking {
     }
 
     // OTHER EXPERIMENTS
-    val cycleTimeCalculator = provideCycleTimeCalculator()
-    val cycleTime = cycleTimeCalculator.calculate(stored)
-    println("\n== Cycle Time ==")
-    println(cycleTime.simpleFormat)
-    println("-- CYCLE TIME --\n")
+    provideGenericLongMetricCalculators().forEach {
+      val metric = it.calculate(stored)
+      println("\n== ${metric.name} ==")
+      println(metric.simpleFormat)
+      println("-- ${metric.name} --\n")
+    }
   } catch (e: Throwable) {
     println("CRITICAL FAILURE! \n\n * ${e.message} * \n\n")
     e.printStackTrace()