diff --git a/buildSrc/repositories.settings.gradle.kts b/buildSrc/repositories.settings.gradle.kts index 8143698..3568925 100644 --- a/buildSrc/repositories.settings.gradle.kts +++ b/buildSrc/repositories.settings.gradle.kts @@ -12,9 +12,9 @@ dependencyResolutionManagement { repositories { myMavenLocal() mavenCentral() - maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { - mavenContent { snapshotsOnly() } - } +// maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { +// mavenContent { snapshotsOnly() } +// } jitpack() gradlePluginPortal() diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index f19b951..903a987 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,3 +1,5 @@ +rootProject.name = "buildSrc" + apply(from = "./repositories.settings.gradle.kts") @Suppress("UnstableApiUsage") // Central declaration of repositories is an incubating feature diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/base.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/base.gradle.kts index b66ec22..1352a4e 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/base.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/base.gradle.kts @@ -8,6 +8,7 @@ plugins { idea } + group = rootProject.group version = rootProject.version @@ -18,19 +19,6 @@ tasks.withType().configureEach { } -val hardReset by tasks.registering(Delete::class) { - group = rootProject.name - doFirst("hardResetConfirmation") { - val answer = project.serviceOf() - .askYesNoQuestion("Are you sure you want to permanently delete Kafkatorio data?") - - if (answer != true) { - throw GradleException("Aborting hard reset") - } - } -} - - tasks.withType().configureEach { exclude("**/.secret.*") } diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts index 7bb535a..830c9fb 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts @@ -23,6 +23,7 @@ val dockerUp by tasks.registering(Exec::class) { commandLine = parseSpaceSeparatedArgs(""" docker-compose up -d """) } + val dockerDown by tasks.registering(Exec::class) { group = dockerComposeTaskGroup @@ -42,11 +43,13 @@ val dockerRemove by tasks.registering(Exec::class) { commandLine = parseSpaceSeparatedArgs(""" docker-compose rm --stop -v -f """) } + afterEvaluate { tasks.named("processRun") { dependsOn(dockerUp, dockerEnv) } tasks.named("processKill") { dependsOn(dockerDown) } } + val dockerEnv by tasks.registering(WriteProperties::class) { group = dockerComposeTaskGroup @@ -60,4 +63,5 @@ val dockerEnv by tasks.registering(WriteProperties::class) { ) } + tasks.assemble { dependsOn(dockerEnv) } diff --git a/modules/events-mod/package.json b/modules/events-mod/package.json index 478d60b..be60289 100644 --- a/modules/events-mod/package.json +++ b/modules/events-mod/package.json @@ -9,8 +9,7 @@ "engines": { "node": "~14.19.1" }, - "devDependencies": { - }, + "devDependencies": {}, "dependencies": { "lua-types": "^2.11.0", "typescript-to-lua": "1.6.0", @@ -18,10 +17,7 @@ "typescript": "4.7.4" }, "license": "UNLICENSED", - "peerDependencies": { - }, - "optionalDependencies": { - }, - "bundledDependencies": [ - ] + "peerDependencies": {}, + "optionalDependencies": {}, + "bundledDependencies": [] } diff --git a/modules/infra-factorio-server/build.gradle.kts b/modules/infra-factorio-server/build.gradle.kts index 7cff893..7d75285 100644 --- a/modules/infra-factorio-server/build.gradle.kts +++ b/modules/infra-factorio-server/build.gradle.kts @@ -57,17 +57,3 @@ idea { excludeDirs.add(file("src/factorio-server")) } } - - -tasks.hardReset { - - dependsOn(tasks.dockerRemove) - - delete( - factorioServerDataDir.dir("saves"), - factorioServerDataDir.dir("temp"), - factorioServerDataDir.file("factorio-current.log"), - factorioServerDataDir.file("factorio-previous.log"), - factorioServerDataDir.file(".lock"), - ) -} diff --git a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/externals/leaflet.kt b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/externals/leaflet.kt index d7a3195..0c59e22 100644 --- a/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/externals/leaflet.kt +++ b/modules/web-map/src/main/kotlin/dev/adamko/kafkatorio/webmap/externals/leaflet.kt @@ -18,16 +18,27 @@ typealias TileOnLoadFn = (done: DoneCallback, tile: HTMLElement) -> Unit sealed interface PolylinePathPoints { - value class D1(val points: Array) : PolylinePathPoints - value class D2(val points: Array>) : PolylinePathPoints - value class D3(val points: Array>>) : PolylinePathPoints + value class D1(val points: List) : PolylinePathPoints { + constructor(points: Array) + : this(points.toList()) + } + + value class D2(val points: List>) : PolylinePathPoints { + constructor(points: Array>) + : this(points.map { x -> x.toList() }.toList()) + } + + value class D3(val points: List>>) : PolylinePathPoints { + constructor(points: Array>>) + : this(points.map { x -> x.map { y -> y.toList() } }.toList()) + } } inline fun Polyline<*>.getLatLngs2(): PolylinePathPoints? { return when (val points = this.getLatLngs()) { - is Array -> PolylinePathPoints.D1(points as Array) - is Array> -> PolylinePathPoints.D2(points as Array>) - is Array>> -> PolylinePathPoints.D3(points as Array>>) + is Array -> PolylinePathPoints.D1(points.unsafeCast>()) + is Array> -> PolylinePathPoints.D2(points.unsafeCast>>()) + is Array>> -> PolylinePathPoints.D3(points.unsafeCast>>>()) else -> null } }