Switch to LP 4.1.0-rc1.

JetBrains · Nov 1, 2023 · bfb37f6 · bfb37f6
1 parent 41c2675
commit bfb37f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ nexusStaging.version=0.30.0
 nexusPublish.version=1.3.0
 
 # Also update JS version in <home>/demo/js-frontend-app/src/main/resources/index.html
-letsPlot.version=4.0.1
+letsPlot.version=4.1.0-rc1
 
 # The latest GeoTools 30-RC do not compile due to
 # "renaming of all "org.opengis" packages into "org.geotools.api" ones"

diff --git a/plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/intern/ToSpecConverters.kt b/plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/intern/ToSpecConverters.kt
@@ -24,6 +24,7 @@ import org.jetbrains.letsPlot.Figure
 import org.jetbrains.letsPlot.GGBunch
 import org.jetbrains.letsPlot.MappingMeta
 import org.jetbrains.letsPlot.commons.intern.datetime.Instant
+import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption
 import org.jetbrains.letsPlot.intern.figure.SubPlotsFigure
 import org.jetbrains.letsPlot.intern.layer.WithSpatialParameters
 import org.jetbrains.letsPlot.intern.standardizing.JvmStandardizing
@@ -77,7 +78,7 @@ fun Plot.toSpec(): MutableMap<String, Any> {
             val prevThemeOpts = spec.getValue(Option.Plot.THEME) as Map<String, Any>
             val newThemeOptions = otherThemeOpts[Option.Meta.NAME]?.let {
                 // keep the previously specified flavor
-                val flavor = prevThemeOpts.filterKeys { it == Option.Theme.FLAVOR }
+                val flavor = prevThemeOpts.filterKeys { it == ThemeOption.FLAVOR }
 
                 // 'named' theme overrides all prev theme options.
                 otherThemeOpts + flavor

diff --git a/plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/themes/themeFlavors.kt b/plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/themes/themeFlavors.kt
@@ -21,7 +21,7 @@ import org.jetbrains.letsPlot.intern.OptionsMap
  */
 fun flavorDarcula() = OptionsMap(
     kind = Option.Plot.THEME,
-    options = mapOf(Option.Theme.FLAVOR to ThemeOption.Flavor.DARCULA)
+    options = mapOf(ThemeOption.FLAVOR to ThemeOption.Flavor.DARCULA)
 )
 
 /**
@@ -33,7 +33,7 @@ fun flavorDarcula() = OptionsMap(
  */
 fun flavorSolarizedLight() = OptionsMap(
     kind = Option.Plot.THEME,
-    options = mapOf(Option.Theme.FLAVOR to ThemeOption.Flavor.SOLARIZED_LIGHT)
+    options = mapOf(ThemeOption.FLAVOR to ThemeOption.Flavor.SOLARIZED_LIGHT)
 )
 
 /**
@@ -45,7 +45,7 @@ fun flavorSolarizedLight() = OptionsMap(
  */
 fun flavorSolarizedDark() = OptionsMap(
     kind = Option.Plot.THEME,
-    options = mapOf(Option.Theme.FLAVOR to ThemeOption.Flavor.SOLARIZED_DARK)
+    options = mapOf(ThemeOption.FLAVOR to ThemeOption.Flavor.SOLARIZED_DARK)
 )
 
 /**
@@ -57,7 +57,7 @@ fun flavorSolarizedDark() = OptionsMap(
  */
 fun flavorHighContrastLight() = OptionsMap(
     kind = Option.Plot.THEME,
-    options = mapOf(Option.Theme.FLAVOR to ThemeOption.Flavor.HIGH_CONTRAST_LIGHT)
+    options = mapOf(ThemeOption.FLAVOR to ThemeOption.Flavor.HIGH_CONTRAST_LIGHT)
 )
 
 /**
@@ -69,5 +69,5 @@ fun flavorHighContrastLight() = OptionsMap(
  */
 fun flavorHighContrastDark() = OptionsMap(
     kind = Option.Plot.THEME,
-    options = mapOf(Option.Theme.FLAVOR to ThemeOption.Flavor.HIGH_CONTRAST_DARK)
+    options = mapOf(ThemeOption.FLAVOR to ThemeOption.Flavor.HIGH_CONTRAST_DARK)
 )
diff --git a/plot-api/src/jvmMain/resources/letsPlotKotlinAPI/version.properties b/plot-api/src/jvmMain/resources/letsPlotKotlinAPI/version.properties
@@ -1,2 +1,2 @@
-lets_plot.version=4.0.1
+lets_plot.version=4.1.0-rc1
 lets_plot_kotlin_api.version=0.0.0-SNAPSHOT