You are working on premex-ab/gross. Make the necessary code changes and commit them with descriptive commit messages. Do not push, create branches, or create PRs — that is handled automatically. --- Fix failing CI on PR: You are working on premex-ab/gross. Make the necessary code changes and commit them with descriptive commit messages. Do not push, create branches, or create PRs — that is handled automatically. --- Fix failing CI on PR: Move data classes to separate deployed library

core/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
     kotlin("jvm") version "2.3.20"
     alias(libs.plugins.org.jetbrains.kotlin.plugin.serialization)
     alias(libs.plugins.io.gitlab.arturbosch.detekt)
-
+    `maven-publish`
 }
 
 detekt {
@@ -32,3 +32,20 @@ dependencies {
 
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8")
 }
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = "se.premex.gross"
+            artifactId = "core"
+            version = "1.0"
+            from(components["java"])
+        }
+    }
+    repositories {
+        maven {
+            name = "testing"
+            url = uri(File(rootDir, "../gross-plugin/build/localMaven"))
+        }
+    }
+}

core/settings.gradle.kts

@@ -0,0 +1,22 @@
+rootProject.name = "core"
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+    @Suppress("UnstableApiUsage")
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+    }
+}

gross-plugin/build.gradle.kts

@@ -48,6 +48,7 @@ dependencies {
     implementation(libs.org.jetbrains.kotlinx.kotlinx.serialization.json)
     implementation(libs.org.jetbrains.kotlinx.kotlinx.serialization.json.okio)
     implementation(libs.com.squareup.okio)
+    implementation("se.premex.gross:core:1.0")
     compileOnly(libs.com.squareup.licensee)
 
     testImplementation(platform(libs.org.junit.junit.bom))
@@ -73,6 +74,7 @@ group = "se.premex"
 tasks.named("test") {
     (this as Test).systemProperties["grossVersion"] = version
     dependsOn(":publishAllPublicationsToTestingRepository")
+    dependsOn(gradle.includedBuild("core").task(":publishAllPublicationsToTestingRepository"))
 }
 
 publishing {

gross-plugin/settings.gradle.kts

@@ -1,5 +1,11 @@
 rootProject.name = "gross-plugin"
 
+includeBuild("../core") {
+    dependencySubstitution {
+        substitute(module("se.premex.gross:core")).using(project(":"))
+    }
+}
+
 pluginManagement {
     repositories {
         gradlePluginPortal()

gross-plugin/src/main/kotlin/se/premex/gross/ArtifactCodeGenerator.kt

@@ -30,9 +30,10 @@ class ArtifactCodeGenerator(
             arguments.add(artifact.groupId)
             arguments.add(artifact.artifactId)
             arguments.add(artifact.version)
-            if (artifact.name != null) {
+            val artifactName = artifact.name
+            if (artifactName != null) {
                 appendLine("""name = %S,""")
-                arguments.add(artifact.name)
+                arguments.add(artifactName)
             } else {
                 appendLine("""name = null,""")
             }
@@ -48,10 +49,11 @@ class ArtifactCodeGenerator(
             }
             appendLine("""),""")
 
-            if (artifact.scm != null) {
+            val artifactScm = artifact.scm
+            if (artifactScm != null) {
                 appendLine("""scm = %T(%S), """.trimMargin())
                 arguments.add(ClassName(packageName, scmTypeSpec.name!!))
-                arguments.add(artifact.scm.url)
+                arguments.add(artifactScm.url)
             } else {
                 appendLine("""scm = null, """.trimMargin())
             }

gross-plugin/src/test/kotlin/se/premex/gross/ArtifactGeneratorTest.kt

@@ -17,9 +17,9 @@ class ArtifactGeneratorTest {
     private val artifactCodeGenerator =
         ArtifactCodeGenerator(
             packageName = packageName,
-            licenseeTypesGenerator.unknownLicensesTypeSpec,
-            licenseeTypesGenerator.spdxLicensesTypeSpec,
-            licenseeTypesGenerator.scmTypeSpec,
+            spdxLicensesTypeSpec = licenseeTypesGenerator.spdxLicensesTypeSpec,
+            scmTypeSpec = licenseeTypesGenerator.scmTypeSpec,
+            unknownLicensesTypeSpec = licenseeTypesGenerator.unknownLicensesTypeSpec,
         )
 
     @Test
@@ -74,7 +74,7 @@ class ArtifactGeneratorTest {
     name = "testName",
     spdxLicenses = kotlin.collections.listOf(
     ),
-    scm = se.premex.gross.SpdxLicenses("testUrl"), 
+    scm = se.premex.gross.Scm("testUrl"), 
     unknownLicenses = kotlin.collections.listOf(
     ),
     )
@@ -110,13 +110,13 @@ class ArtifactGeneratorTest {
     version = "testVersion",
     name = "testName",
     spdxLicenses = kotlin.collections.listOf(
-    se.premex.gross.UnknownLicenses(identifier = "spdxId1", name = "spdxName1", url = "spdxUrl1"),
-    se.premex.gross.UnknownLicenses(identifier = "spdxId2", name = "spdxName2", url = "spdxUrl2"),
+    se.premex.gross.SpdxLicenses(identifier = "spdxId1", name = "spdxName1", url = "spdxUrl1"),
+    se.premex.gross.SpdxLicenses(identifier = "spdxId2", name = "spdxName2", url = "spdxUrl2"),
     ),
-    scm = se.premex.gross.SpdxLicenses("testUrl"), 
+    scm = se.premex.gross.Scm("testUrl"), 
     unknownLicenses = kotlin.collections.listOf(
-    se.premex.gross.Scm(name = "unknown1", url = "unknown1"),
-    se.premex.gross.Scm(name = "unknown2", url = "unknown2"),
+    se.premex.gross.UnknownLicenses(name = "unknown1", url = "unknown1"),
+    se.premex.gross.UnknownLicenses(name = "unknown2", url = "unknown2"),
     ),
     )
 

settings.gradle.kts

@@ -41,8 +41,8 @@ dependencyResolutionManagement {
 rootProject.name = "Gross"
 
 includeBuild("gross-plugin")
+includeBuild("core")
 
 include("ui")
-include("core")
 include(":app")
 

ui/build.gradle.kts

@@ -41,7 +41,7 @@ kotlin {
 }
 
 dependencies {
-    api(projects.core)
+    api("se.premex.gross:core:1.0")
     implementation(libs.com.squareup.okio)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.runtime)