Skip to content

Commit

Permalink
Upload artifact v4 (#79)
Browse files Browse the repository at this point in the history
* upload-artifact@v4

* replacing the platform with `<platform>`
  • Loading branch information
handstandsam authored Oct 31, 2024
1 parent 89cc1ee commit 8b5638e
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

- name: (Fail-only) Upload the build report
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: error-report
path: build-reports.zip
Expand Down
62 changes: 35 additions & 27 deletions desktop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,56 +1,64 @@
plugins {
kotlin("multiplatform")
alias(libs.plugins.compose.compiler)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.dependency.guard)
kotlin("multiplatform")
alias(libs.plugins.compose.compiler)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.dependency.guard)
}
dependencyGuard {
configuration("desktopRuntimeClasspath")
configuration("desktopRuntimeClasspath") {
baselineMap = {
if (it.contains("linux-x64") || it.contains("macos-arm64")) {
it.replace("macos-arm64", "<platform>").replace("linux-x64", "<platform>")
} else {
it
}
}
}
}

kotlin {
jvm("desktop")
sourceSets {
val commonMain by getting {
dependencies {
implementation(compose.foundation)
implementation(compose.material3)
implementation(project(":mock-data"))
implementation(project(":models"))
implementation(project(":networking"))
implementation(project(":shopping-cart"))
}
}
jvm("desktop")
sourceSets {
val commonMain by getting {
dependencies {
implementation(compose.foundation)
implementation(compose.material3)
implementation(project(":mock-data"))
implementation(project(":models"))
implementation(project(":networking"))
implementation(project(":shopping-cart"))
}
}

val desktopMain by getting {
dependsOn(commonMain)
dependencies {
implementation(compose.desktop.currentOs)
val desktopMain by getting {
dependsOn(commonMain)
dependencies {
implementation(compose.desktop.currentOs)


// implementation(compose.desktop.currentOs)
implementation(project(":compose-ui"))
implementation(project(":compose-ui"))
// implementation("androidx.compose.ui:ui-desktop-:1.7.0-beta02")
// implementation("androidx.compose.material3:material3-window-size-class:1.3.0-beta04")
// implementation("org.jetbrains.compose.desktop:desktop-jvm-macos-arm64:1.6.11")
// implementation("androidx.compose.material3:material3:1.3.0-beta04")
// implementation("androidx.compose.material:material:1.3.0-beta04")
// implementation("androidx.compose.material3:material3-window-size-class:1.3.0-beta04")
// api(libs.androidx.material3.desktop)
}
}
}
}
}
}
compose.desktop {


application {
mainClass = "com.handstandsam.shoppingapp.compose.MainKt"
application {
mainClass = "com.handstandsam.shoppingapp.compose.MainKt"

// nativeDistributions {
// targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
// packageName = "ShoppingApp Desktop"
// packageVersion = "1.0.0"
// }
}
}
}
4 changes: 2 additions & 2 deletions desktop/dependencies/desktopRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ org.jetbrains.compose.animation:animation-desktop:1.6.11
org.jetbrains.compose.animation:animation:1.6.11
org.jetbrains.compose.annotation-internal:annotation:1.6.11
org.jetbrains.compose.collection-internal:collection:1.6.11
org.jetbrains.compose.desktop:desktop-jvm-macos-arm64:1.6.11
org.jetbrains.compose.desktop:desktop-jvm-<platform>:1.6.11
org.jetbrains.compose.desktop:desktop-jvm:1.6.11
org.jetbrains.compose.desktop:desktop:1.6.11
org.jetbrains.compose.foundation:foundation-desktop:1.6.11
Expand Down Expand Up @@ -94,7 +94,7 @@ org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.1
org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1
org.jetbrains.skiko:skiko-awt-runtime-macos-arm64:0.8.4
org.jetbrains.skiko:skiko-awt-runtime-<platform>:0.8.4
org.jetbrains.skiko:skiko-awt:0.8.4
org.jetbrains.skiko:skiko:0.8.4
org.jetbrains:annotations:23.0.0
Expand Down

0 comments on commit 8b5638e

Please sign in to comment.