From ea7869e39d6cc690f0808f933b432a75c07cd2d5 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 15 Nov 2023 16:43:13 +0300 Subject: [PATCH] First preview of 0.3.0 --- build.gradle.kts | 13 ++-------- gradle.properties | 4 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- maps-kt-compose/build.gradle.kts | 4 +++ maps-kt-leaflet/build.gradle.kts | 31 +++++++++++++++++++++++ maps-kt-leaflet/src/jsMain/kotlin/main.kt | 7 +++++ settings.gradle.kts | 1 + 7 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 maps-kt-leaflet/build.gradle.kts create mode 100644 maps-kt-leaflet/src/jsMain/kotlin/main.kt diff --git a/build.gradle.kts b/build.gradle.kts index 11adfc1..abaa2d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import space.kscience.gradle.isInDevelopment import space.kscience.gradle.useApache2Licence import space.kscience.gradle.useSPCTeam @@ -24,15 +23,8 @@ ksciencePublish { useApache2Licence() useSPCTeam() } - github("SciProgCentre", "maps-kt") - space( - if (isInDevelopment) { - "https://maven.pkg.jetbrains.space/spc/p/sci/dev" - } else { - "https://maven.pkg.jetbrains.space/spc/p/sci/maven" - } - ) - sonatype() + repository("spc","https://maven.sciprog.center/kscience") + sonatype("https://oss.sonatype.org") } subprojects { @@ -47,4 +39,3 @@ subprojects { readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md") - diff --git a/gradle.properties b/gradle.properties index 043026b..fe14959 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ kotlin.code.style=official -compose.version=1.5.2 +compose.version=1.5.10 org.jetbrains.compose.experimental.jscanvas.enabled=true agp.version=8.1.0 @@ -9,4 +9,4 @@ android.enableJetifier=true org.gradle.jvmargs=-Xmx4096m -toolsVersion=0.14.9-kotlin-1.9.0 \ No newline at end of file +toolsVersion=0.15.0-kotlin-1.9.20 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/maps-kt-compose/build.gradle.kts b/maps-kt-compose/build.gradle.kts index e266367..c7a0359 100644 --- a/maps-kt-compose/build.gradle.kts +++ b/maps-kt-compose/build.gradle.kts @@ -55,3 +55,7 @@ readme { id = "osm", ) { "OpenStreetMap tile provider." } } + +//tasks.getByName("downloadWix"){ +// duplicatesStrategy = DuplicatesStrategy.WARN +//} diff --git a/maps-kt-leaflet/build.gradle.kts b/maps-kt-leaflet/build.gradle.kts new file mode 100644 index 0000000..6644712 --- /dev/null +++ b/maps-kt-leaflet/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + id("space.kscience.gradle.mpp") + id("org.jetbrains.compose") + `maven-publish` +} + +kscience{ + js { + binaries.executable() + } +} + +kotlin { + sourceSets { + val jsMain by getting { + dependencies { + implementation(projects.mapsKtCompose) + implementation(compose.runtime) + implementation(compose.html.core) + implementation(npm("@types/leaflet", "1.9.6")) + } + } + } +} + +compose { + experimental.web{ + application{} + } +// web{} +} \ No newline at end of file diff --git a/maps-kt-leaflet/src/jsMain/kotlin/main.kt b/maps-kt-leaflet/src/jsMain/kotlin/main.kt new file mode 100644 index 0000000..e6d832d --- /dev/null +++ b/maps-kt-leaflet/src/jsMain/kotlin/main.kt @@ -0,0 +1,7 @@ +import org.jetbrains.skiko.wasm.onWasmReady + +fun main() { + onWasmReady { + + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 8307daa..4254c8c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,6 +56,7 @@ include( ":maps-kt-features", ":maps-kt-compose", ":maps-kt-scheme", +// ":maps-kt-leaflet", ":demo:maps", ":demo:scheme", ":demo:polygon-editor",