diff --git a/.github/workflows/build-ga.yaml b/.github/workflows/build-ga.yaml index c3e187c..e2a3a25 100644 --- a/.github/workflows/build-ga.yaml +++ b/.github/workflows/build-ga.yaml @@ -37,17 +37,14 @@ jobs: - name: Lint check run: ./gradlew ktlintCheck - # - name: Build all targets - # run: ./gradlew assemble - - - name: Build JVM targets - run: ./gradlew shadowJar + - name: Build all targets + run: ./gradlew assemble - name: Run JVM tests run: ./gradlew jvmTest -# - name: Run Mac/Native tests -# run: ./gradlew macNativeTest + - name: Run Mac/Native tests + run: ./gradlew macNativeTest - name: Prepare for Publishing run: ./gradlew prepareForPublish diff --git a/.github/workflows/build-pr.yaml b/.github/workflows/build-pr.yaml index fb80be1..7ded9f1 100644 --- a/.github/workflows/build-pr.yaml +++ b/.github/workflows/build-pr.yaml @@ -37,17 +37,14 @@ jobs: - name: Lint check run: ./gradlew ktlintCheck - # - name: Build all targets - # run: ./gradlew assemble - - - name: Build JVM targets - run: ./gradlew shadowJar + - name: Build all targets + run: ./gradlew assemble - name: Run JVM tests run: ./gradlew jvmTest -# - name: Run Mac/Native tests -# run: ./gradlew macNativeTest + - name: Run Mac/Native tests + run: ./gradlew macNativeTest - name: Prepare for Publishing run: ./gradlew prepareForPublish diff --git a/build.gradle.kts b/build.gradle.kts index fc3eabf..c795334 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,6 @@ import org.gradle.internal.impldep.org.joda.time.LocalDateTime import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests plugins { application @@ -98,20 +97,20 @@ kotlin { } // used by the 'getting' delegate -// @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress") -// val macNativeMain by getting { -// dependsOn(commonMain) -// dependencies { -// implementation("io.ktor:ktor-client-curl:2.3.+") -// implementation("app.cash.sqldelight:native-driver:2.+") -// } -// } + @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress") + val macNativeMain by getting { + dependsOn(commonMain) + dependencies { + implementation("io.ktor:ktor-client-curl:2.3.+") + implementation("app.cash.sqldelight:native-driver:2.+") + } + } // used by the 'getting' delegate -// @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress") -// val macNativeTest by getting { -// dependsOn(commonTest) -// } + @Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress") + val macNativeTest by getting { + dependsOn(commonTest) + } } @@ -410,15 +409,12 @@ class Configurator(private val env: Env, private val output: Output) { println("Configured Kotlin target '$name'") } - @Suppress("USELESS_CAST", "UNUSED_PARAMETER") - fun configureNativeTarget(container: KotlinTargetContainerWithPresetFunctions): KotlinNativeTargetWithHostTests? = + fun configureNativeTarget(container: KotlinTargetContainerWithPresetFunctions) = when (env.currentPlatform) { - // TODO – disabled temporarily until the build is fixed - Env.Platform.MAC -> null as? KotlinNativeTargetWithHostTests? - // when (env.currentArch) { - // Env.Arch.X86 -> container.macosX64(env.currentPlatform.targetName) - // Env.Arch.ARM -> container.macosArm64(env.currentPlatform.targetName) - // } + 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 -> diff --git a/gradle.properties b/gradle.properties index 72543c5..0b50e8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,6 @@ org.gradle.jvmargs=-Xmx4096m # Project properties config.group = xyz.marinkovic.milos config.artifact = codestats -config.version = 0.9.0 +config.version = 0.10.0 config.gitHubRepoOwner = milosmns config.gitHubRepoName = code-stats