Skip to content

Commit

Permalink
Release v4.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
alshan committed Nov 19, 2024
1 parent 8f19b4c commit 2631545
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 61 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). All scales should have the 'format' parameter.

## [4.9.2] - 2024-11-19

Same as 4.9.1, added missing Maven artifacts.

## [4.9.1] - 2024-11-18

This release is 100% compatible with Lets-Plot [v 4.5.1](https://github.com/JetBrains/lets-plot/releases/tag/v4.5.1),
Expand Down
6 changes: 3 additions & 3 deletions USAGE_BATIK_JFX_JS.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ plugins {

dependencies {
// Lets-Plot Kotlin API
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.9.1")
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.9.2")
// Lets-Plot Multiplatform (Batik rendering)
implementation("org.jetbrains.lets-plot:lets-plot-batik:4.5.1")
}
Expand All @@ -75,7 +75,7 @@ plugins {

dependencies {
// Lets-Plot Kotlin API
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.9.1")
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.9.2")
// Lets-Plot Multiplatform (JFX Scene rendering)
implementation("org.jetbrains.lets-plot:lets-plot-jfx:4.5.1")
}
Expand All @@ -95,7 +95,7 @@ kotlin {
named("jsMain") {
dependencies {
// Lets-Plot Kotlin API
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-js:4.9.1")
implementation("org.jetbrains.lets-plot:lets-plot-kotlin-js:4.9.2")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ allprojects {
group = "org.jetbrains.lets-plot"
version = when (name) {
"dokka" -> "4.9.0"
else -> "4.9.2-SNAPSHOT"
else -> "4.9.3-SNAPSHOT"
// else -> "0.0.0-SNAPSHOT" // for local publishing only
}

Expand Down
12 changes: 6 additions & 6 deletions devdocs/JUPYTER_KOTLIN_KERNEL.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ Clear Maven cache:

#### 1) Publish artifacts to the local dev-repo:

`$ ./gradlew publishJvmPublicationToMavenLocalRepository`
`$ ./gradlew publishLetsPlotKotlinGeoToolsPublicationToMavenLocalRepository`
`$ ./gradlew publishletsPlotKotlinJupyterPublicationToMavenLocalRepository`
`$ ./gradlew publishletsPlotKotlinGeotoolsJupyterPublicationToMavenLocalRepository`
`$ ./gradlew publishLetsPlotKotlinJsonPublicationToMavenLocalRepository`
`./gradlew publishJvmPublicationToMavenLocalRepository`
`./gradlew publishLetsPlotKotlinGeoToolsPublicationToMavenLocalRepository`
`./gradlew publishletsPlotKotlinJupyterPublicationToMavenLocalRepository`
`./gradlew publishletsPlotKotlinGeotoolsJupyterPublicationToMavenLocalRepository`
`./gradlew publishLetsPlotKotlinJsonPublicationToMavenLocalRepository`

It will publish `lets-plot-kotlin-api-kernel-<version>` etc. artifacts to `<project root>/.maven-publish-dev-repo/` folder.
It will publish all artifacts to `<project root>/.maven-publish-dev-repo/` folder.

#### 2) Edit "lets-plot.json" (see info above about its location):

Expand Down
36 changes: 13 additions & 23 deletions devdocs/PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
> **Note**: make sure that **version** is set to "0.0.0-SNAPSHOT" in `build.gradle.kts`.
`./gradlew :plot-api:publishAllPublicationsToMavenLocalRepository`

`./gradlew publishLetsPlotKotlinGeoToolsPublicationToMavenLocalRepository`

`./gradlew publishletsPlotKotlinJupyterPublicationToMavenLocalRepository`
`./gradlew publishletsPlotKotlinGeotoolsJupyterPublicationToMavenLocalRepository`
`./gradlew publishLetsPlotKotlinJsonPublicationToMavenLocalRepository`

### Publishing to Sonatype Maven Repository
Expand All @@ -29,8 +30,10 @@ sonatype.password=<your Sonatype password>
Specify "x.y.z-SNAPSHOT" version in `build.gradle.kts` file.

`./gradlew :plot-api:publishAllPublicationsToSonatypeRepository`

`./gradlew publishLetsPlotKotlinGeoToolsPublicationToSonatypeRepository`
`./gradlew publishletsPlotKotlinJupyterPublicationToSonatypeRepository`
`./gradlew publishletsPlotKotlinGeotoolsJupyterPublicationToSonatypeRepository`
`./gradlew publishLetsPlotKotlinJsonPublicationToSonatypeRepository`

> You can find published SNAPSHOT artifacts here https://oss.sonatype.org/index.html#view-repositories;snapshots~browsestorage \
> In the "Browse Storage" tab enter ‘Path lookup’: org/jetbrains/lets-plot
Expand All @@ -45,7 +48,13 @@ Specify "x.y.z-SNAPSHOT" version in `build.gradle.kts` file.

> **Note**: Publish tasks should be invoked with a single command to avoid splitting of the staging repository.
`./gradlew :plot-api:publishAllPublicationsToSonatypeRepository publishLetsPlotKotlinGeoToolsPublicationToSonatypeRepository`
```shell
./gradlew :plot-api:publishAllPublicationsToSonatypeRepository \
publishLetsPlotKotlinGeoToolsPublicationToSonatypeRepository \
publishletsPlotKotlinJupyterPublicationToSonatypeRepository \
publishletsPlotKotlinGeotoolsJupyterPublicationToSonatypeRepository \
publishLetsPlotKotlinJsonPublicationToSonatypeRepository
```

> Check artifacts are uploaded to staging repository:
>
Expand All @@ -64,22 +73,3 @@ Specify "x.y.z-SNAPSHOT" version in `build.gradle.kts` file.
>
> In the "Browse Storage" tab enter ‘Path lookup’: org/jetbrains/lets-plot

### Miscellanea

Individually Lets-Plot Kotlin API artifacts can be published with commands:

- "Kotlin kernel":
- `./gradlew publishLetsPlotKotlinKernelPublicationToSonatypeRepository`


- Multi-platform:
- `./gradlew :plot-api:publishKotlinMultiplatformPublicationToSonatypeRepository`
- `./gradlew :plot-api:publishJvmPublicationToSonatypeRepository`
- `./gradlew :plot-api:publishJsPublicationToSonatypeRepository`

> **Note**: Each publish command will open a separate Nexus staging repository.
>
> In case you want to upload artifacts to one repository, call the necessary tasks with one command.

18 changes: 13 additions & 5 deletions devdocs/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@
> - [geospatial-charts.md](../Writerside/topics/geospatial_charts.md).
##### 3. Build and release artifacts to Sonatype repository / Maven Central

- `./gradlew clean`
- `./gradlew build`
- `./gradlew :plot-api:publishAllPublicationsToSonatypeRepository publishLetsPlotKotlinGeoToolsPublicationToSonatypeRepository`
- `./gradlew findSonatypeStagingRepository closeAndReleaseSonatypeStagingRepository`
```shell
./gradlew clean
./gradlew build

./gradlew :plot-api:publishAllPublicationsToSonatypeRepository \
publishLetsPlotKotlinGeoToolsPublicationToSonatypeRepository \
publishletsPlotKotlinJupyterPublicationToSonatypeRepository \
publishletsPlotKotlinGeotoolsJupyterPublicationToSonatypeRepository \
publishLetsPlotKotlinJsonPublicationToSonatypeRepository

./gradlew findSonatypeStagingRepository closeAndReleaseSonatypeStagingRepository
```

> **Note**: For more details see [PUBLISHING.md](PUBLISHING.md).
Expand Down
2 changes: 1 addition & 1 deletion future_changes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [4.9.2] - 202y-mm-dd
## [4.9.3] - 202y-mm-dd

This release is 100% compatible with Lets-Plot [v 4.5.1](https://github.com/JetBrains/lets-plot/releases/tag/v4.5.1),
GeoTools [v 32.1](https://github.com/geotools/geotools/releases/tag/32.0)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
lets_plot.version=4.5.1
lets_plot_kotlin_api.version=4.9.1
lets_plot_kotlin_api.version=4.9.2
11 changes: 11 additions & 0 deletions toolkit/geotools-jupyter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ val artifactBaseName = "lets-plot-kotlin-geotools-jupyter"
val artifactGroupId = project.group as String
val artifactVersion = project.version as String

val jarJavaDocs by tasks.creating(Jar::class) {
archiveClassifier.set("javadoc")
group = "lets plot"
from("$rootDir/README.md")
}

java {
withSourcesJar()
}

afterEvaluate {

publishing {
Expand All @@ -63,6 +73,7 @@ afterEvaluate {
version = artifactVersion

from(components["java"])
artifact(jarJavaDocs)

pom {
name.set("Lets-Plot Kotlin Geotools Jupyter Integration")
Expand Down
18 changes: 3 additions & 15 deletions toolkit/geotools/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,8 @@ val artifactBaseName = "lets-plot-kotlin-geotools"
val artifactGroupId = project.group as String
val artifactVersion = project.version as String

val jarClasses by tasks.creating(Jar::class) {
group = "lets plot"
from(sourceSets.main.get().output)
}

val jarSources by tasks.creating(Jar::class) {
archiveClassifier.set("sources")
group = "lets plot"
from(sourceSets.main.get().allSource)
java {
withSourcesJar()
}

val jarJavaDocs by tasks.creating(Jar::class) {
Expand All @@ -53,12 +46,7 @@ afterEvaluate {
artifactId = artifactBaseName
version = artifactVersion

// This leads to 'maven-publish' failure: "Publishing is not able to resolve a dependency
// on a project with multiple publications that have different coordinates."
// from(components["java"])

artifact(jarClasses)
artifact(jarSources)
from(components["java"])
artifact(jarJavaDocs)

pom {
Expand Down
11 changes: 11 additions & 0 deletions toolkit/json/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ val artifactBaseName = "lets-plot-kotlin-json"
val artifactGroupId = project.group as String
val artifactVersion = project.version as String

val jarJavaDocs by tasks.creating(Jar::class) {
archiveClassifier.set("javadoc")
group = "lets plot"
from("$rootDir/README.md")
}

java {
withSourcesJar()
}

afterEvaluate {
publishing {
publications {
Expand All @@ -26,6 +36,7 @@ afterEvaluate {
version = artifactVersion

from(components["java"])
artifact(jarJavaDocs)

pom {
name.set("Lets-Plot Kotlin Util")
Expand Down
18 changes: 12 additions & 6 deletions toolkit/jupyter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,11 @@ val letsPlotKotlinVersion = project.version as String
val kotlinLoggingVersion = extra["kotlinLogging.version"] as String

dependencies {
// All LP/LPK implementations to be loaded in notebook
implementation(projects.plotApi)
implementation(projects.json)

// implementation("org.jetbrains.lets-plot:lets-plot-common:$letsPlotVersion")
implementation("org.jetbrains.lets-plot:platf-awt-jvm:$letsPlotVersion")
implementation("org.jetbrains.lets-plot:lets-plot-image-export:$letsPlotVersion")
// implementation("io.github.microutils:kotlin-logging-jvm:$kotlinLoggingVersion")

implementation(projects.json)
// implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")

testImplementation(kotlin("test"))
}
Expand Down Expand Up @@ -50,6 +45,16 @@ val artifactBaseName = "lets-plot-kotlin-jupyter"
val artifactGroupId = project.group as String
val artifactVersion = project.version as String

val jarJavaDocs by tasks.creating(Jar::class) {
archiveClassifier.set("javadoc")
group = "lets plot"
from("$rootDir/README.md")
}

java {
withSourcesJar()
}

afterEvaluate {

publishing {
Expand All @@ -62,6 +67,7 @@ afterEvaluate {
version = artifactVersion

from(components["java"])
artifact(jarJavaDocs)

pom {
name.set("Lets-Plot Kotlin Jupyter Integration")
Expand Down

0 comments on commit 2631545

Please sign in to comment.