Skip to content

Commit

Permalink
(Mostly) use remote dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
toasterofbread committed Jul 24, 2024
1 parent 676f443 commit 7fa7cc9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
12 changes: 5 additions & 7 deletions buildSrc/src/main/kotlin/plugins/spmp/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package plugin.spmp

import org.gradle.language.ComponentDependencies

class SpMpDeps(extra: Map<String, Any>) {
companion object {
const val OUTPUT_DIR: String = "generated/sources/dependencyList/main/com/toasterofbread/spmp"
Expand All @@ -28,23 +26,23 @@ class SpMpDeps(extra: Map<String, Any>) {
val dependencies: Map<String, DependencyInfo> =
mapOf(
"dev.toastbits:spms" to DependencyInfo(
version = "0.4.0-beta2-SNAPSHOT",
version = "0.3.1-wasm2",
name = "spmp-server",
author = "toasterofbread",
url = "https://github.com/toasterofbread/spmp-server",
license = "GPL-2.0",
license_url = "https://github.com/toasterofbread/spmp-server/blob/6dde651ffc102d604ac7ecd5ac7471b1572fd2e6/LICENSE"
),
"dev.toastbits.composekit" to DependencyInfo(
version = "0.0.3-SNAPSHOT",
version = "e83119148b",
name = "ComposeKit",
author = "toasterofbread",
url = "https://github.com/toasterofbread/composekit",
license = "GPL-3.0",
license_url = "https://github.com/toasterofbread/ComposeKit/blob/136f216e65395660255d3270af9b79c90ae2254c/LICENSE"
),
"dev.toastbits.ytmkt" to DependencyInfo(
version = "0.2.6-SNAPSHOT",
version = "0.3.0",
name = "ytm-kt",
author = "toasterofbread",
url = "https://github.com/toasterofbread/ytm-kt",
Expand All @@ -59,8 +57,8 @@ class SpMpDeps(extra: Map<String, Any>) {
license = "Apache-2.0",
license_url = "https://github.com/toasterofbread/mediasession-kt/blob/fd4c5e876e2782dbe856b886f5b8dc083c26293c/LICENSE"
),
"dev.toastbits.kanakt" to DependencyInfo(
version = "0.0.1",
"dev.toastbits.kana-kt" to DependencyInfo(
version = "c891811875",
name = "kana-kt",
author = "toasterofbread",
url = "https://github.com/toasterofbread/kana-kt",
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android.suppressUnsupportedCompileSdk=34
org.jetbrains.compose.experimental.wasm.enabled=true

# Plugin versions
kotlin.version=2.0.20-RC-152
kotlin.version=2.0.10-RC2-532
agp.version=8.4.1
compose.version=1.7.0-dev1731
sqldelight.version=2.1.0-SNAPSHOT
Expand Down
6 changes: 5 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pluginManagement {
google()
maven("https://oss.sonatype.org/content/repositories/snapshots/")
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
maven("https://jitpack.io")
}

plugins {
Expand All @@ -35,9 +36,10 @@ pluginManagement {

dependencyResolutionManagement {
repositories {
mavenLocal()

google()
mavenCentral()
mavenLocal()
maven("https://jitpack.io")

// https://github.com/KevinnZou/compose-webview-multiplatform
Expand All @@ -51,5 +53,7 @@ dependencyResolutionManagement {

maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")

maven("https://oss.sonatype.org/content/repositories/snapshots")
}
}
4 changes: 3 additions & 1 deletion shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ kotlin {
implementation(deps.get("dev.toastbits:spms"))
implementation(deps.get("dev.toastbits.composekit:library"))
implementation(deps.get("dev.toastbits.ytmkt:ytmkt"))
implementation(deps.get("dev.toastbits.kanakt:kanakt"))
implementation(deps.get("dev.toastbits.kana-kt:kanakt"))

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
Expand Down Expand Up @@ -127,6 +127,7 @@ kotlin {
implementation(deps.get("dev.toastbits.compose-webview-multiplatform:compose-webview-multiplatform"))
implementation(deps.get("org.bitbucket.ijabz:jaudiotagger"))


// TEMP
implementation("com.github.wanasit.kotori:kotori-jvm:1.0.0-TEST")
}
Expand Down Expand Up @@ -174,6 +175,7 @@ kotlin {
implementation(deps.get("app.cash.sqldelight:web-worker-driver-wasm-js"))

// TEMP
// implementation("com.catppuccin:catppuccin-kotlin-wasm-js:1.0.3-dev")
implementation("com.github.wanasit.kotori:kotori-wasm-js:1.0.0-TEST")
}
}
Expand Down

0 comments on commit 7fa7cc9

Please sign in to comment.