Reverted target switching. Enabled DCE.

build.gradle

@@ -198,27 +198,18 @@ subprojects {
 
  kotlin{
  if (project.buildSettings.build_python_extension) {
- if (version.contains("alpha")){
- if (currentOs.macOsX & currentOsArch.amd64) {
- macosX64()
- } else if (currentOs.macOsX & currentOsArch.arm) {
- macosArm64()
- } else if (currentOs.linux & currentOsArch.amd64) {
- linuxX64()
- } else if (currentOs.linux & currentOsArch.arm) {
- linuxArm64()
- }
- } else {
- if (currentOs.macOsX) {
- macosArm64()
- macosX64()
- } else if (currentOs.linux) {
- linuxArm64()
- linuxX64()
- }
- }
- if (currentOs.windows) {
+ if (currentOs.macOsX & currentOsArch.amd64) {
+ macosX64()
+ } else if (currentOs.macOsX & currentOsArch.arm) {
+ macosArm64()
+ } else if (currentOs.linux & currentOsArch.amd64) {
+ linuxX64()
+ } else if (currentOs.linux & currentOsArch.arm) {
+ linuxArm64()
+ } else if (currentOs.windows) {
  mingwX64()
+ } else {
+ throw new Exception("Unsupported platform.")
  }
  }
  }

js-package/build.gradle

@@ -31,9 +31,6 @@ kotlin {
  target {
  browser {
  dceTask {
- // DCE disabled to prevent 'Exception in thread "main" java.lang.StackOverflowError' error.
- dceOptions.devMode = true
-
  keep.addAll(
  "lets-plot-js-package.buildPlotFromRawSpecs",
  "lets-plot-js-package.buildPlotFromProcessedSpecs",

python-extension/build.gradle

@@ -15,41 +15,32 @@ def currentOsArch = DefaultNativePlatform.getCurrentArchitecture()
 
 kotlin {
  if (project.buildSettings.build_python_extension) {
- def targetList = []
- if (version.contains("alpha")){
- if (currentOs.macOsX & currentOsArch.amd64) {
-  targetList.add(macosX64("native"))
- } else if (currentOs.macOsX & currentOsArch.arm) {
-  targetList.add(macosArm64("native"))
- } else if (currentOs.linux & currentOsArch.amd64) {
-  targetList.add(linuxX64("native"))
- } else if (currentOs.linux & currentOsArch.arm) {
-  targetList.add(linuxArm64("native"))
- }
+ def target
+ if (currentOs.macOsX & currentOsArch.amd64) {
+ target = macosX64("native")
+ } else if (currentOs.macOsX & currentOsArch.arm) {
+ target = macosArm64("native")
+ } else if (currentOs.linux & currentOsArch.amd64) {
+ target = linuxX64("native")
+ } else if (currentOs.linux & currentOsArch.arm) {
+ target =linuxArm64("native")
+ } else if (currentOs.windows) {
+ target = mingwX64("native")
  } else {
- if (currentOs.macOsX) {
- targetList.add(macosArm64("native"))
- targetList.add(macosX64("native"))
- } else if (currentOs.linux) {
- targetList.add(linuxArm64("native"))
- targetList.add(linuxX64("native"))
- }
- }
- if (currentOs.windows) {
- mingwX64("native")
+ throw new Exception("Unsupported platform.")
  }
- for (target in targetList) {
- target.binaries {
- staticLib {
- baseName = "lets-plot-${project.name}"
- }
+
+ target.binaries {
+ staticLib {
+ baseName = "lets-plot-${project.name}"
  }
-  target.compilations.main.cinterops {
-  python {
-  compilerOpts "-I${project.buildSettings.python.include_path}"
- }
+ }
+ target.compilations.main.cinterops {
+ python {
+ compilerOpts "-I${project.buildSettings.python.include_path}"
  }
  }
+
  } else {
  jvm() // at least one target is required by MPP - dummy jvm target will work just fine
  }