Move architecture check to function. Remove currentOS variable.

build.gradle

@@ -50,8 +50,6 @@ allprojects {
  }
 }
 
-project.ext.currentOs = DefaultNativePlatform.getCurrentOperatingSystem()
-
 // Read build settings from commandline parameters (for build_release.py script):
 def readSettingsFromParameters() {
  def settings = [
@@ -85,13 +83,30 @@ def readSettingsFromYaml() {
  throw new GradleException("Couldn't read build_settings.yml")
  }
  def settings = new Yaml().load(build_settings_file.newInputStream())
- if (!project.currentOs.windows) {
- assert settings.architecture != null // Skip architecture property for Windows systems.
+ if (!DefaultNativePlatform.getCurrentOperatingSystem().windows) {
+ assert settings.architecture != null // Windows only 64bit version can be builе, so the arch parameter is not needed and may not be set.
  }
-
  if (settings.enable_python_package) {
  assert settings.python.bin_path != null
  assert settings.python.include_path != null
+
+ if (!DefaultNativePlatform.getCurrentOperatingSystem().windows) {
+ def getArchOutput = new ByteArrayOutputStream()
+ exec {
+ commandLine "${settings.python.bin_path}/python",
+ "-c",
+ "import platform; print(platform.machine())"
+ standardOutput = getArchOutput
+ }
+ def currentPythonArch = getArchOutput.toString().trim()
+
+ if (currentPythonArch != settings.architecture) {
+ throw new IllegalArgumentException("Project and Python architectures don't match!\n" +
+ " - Value, from your 'build_settings.yml' file: ${settings.architecture}\n" +
+ " - Your Python architecture: ${currentPythonArch}\n" +
+ "Check your 'build_settings.yml' file.")
+ }
+ }
  }
  return settings
 }
@@ -104,23 +119,6 @@ if (project.hasProperty("build_release")) {
  project.ext.buildSettings = readSettingsFromYaml() as LinkedHashMap
 }
 
-// Check architecture parameter, if python-package has been enabled (skipped for Windows):
-if (project.buildSettings.enable_python_package && !project.currentOs.windows) {
- def getArchOutput = new ByteArrayOutputStream()
- exec {
- commandLine "${project.buildSettings.python.bin_path}/python",
- "-c",
- "import platform; print(platform.machine())"
- standardOutput = getArchOutput
- }
- def currentPythonArch = getArchOutput.toString().trim()
-
- if (currentPythonArch != project.buildSettings.architecture) {
- throw new Exception("Project and Python architectures don't match!\n" +
- "You have enabled python-package and your architecture value from project settings doesn't match\n" +
- "your Python architecture. Check these settings in your 'build_settings.yml' file.")
- }
-}
 
 // Maven publication settings
 // define local Maven Repository path:
@@ -170,23 +168,23 @@ subprojects {
  apply plugin: "org.jetbrains.kotlin.multiplatform"
 
  kotlin {
- if (project.currentOs.macOsX & project.buildSettings.architecture == "x86_64") {
+ if (DefaultNativePlatform.getCurrentOperatingSystem().macOsX & project.buildSettings.architecture == "x86_64") {
  macosX64()
- } else if (project.currentOs.macOsX & project.buildSettings.architecture == "arm64") {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().macOsX & project.buildSettings.architecture == "arm64") {
  if (project.hasProperty("build_release")) {
  macosX64()
  macosArm64()
  } else {
  macosArm64()
  }
- } else if (project.currentOs.linux) {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().linux) {
  if (project.hasProperty("build_release")) {
  linuxX64()
  linuxArm64()
  } else if (project.buildSettings.architecture == "x86_64") {
  linuxX64()
  }
- } else if (project.currentOs.windows) {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().windows) {
  mingwX64()
  } else {
  throw new Exception("Unsupported platform! Check project settings.")

python-extension/build.gradle

@@ -7,21 +7,22 @@ plugins {
  id "org.jetbrains.kotlin.multiplatform"
 }
 
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
 kotlin {
 
  if (project.buildSettings.enable_python_package) {
 
  def target
- if (project.currentOs.macOsX & project.buildSettings.architecture == "x86_64") {
+ if (DefaultNativePlatform.getCurrentOperatingSystem().macOsX & project.buildSettings.architecture == "x86_64") {
  target = macosX64("native")
- } else if (project.currentOs.macOsX & project.buildSettings.architecture == "arm64") {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().macOsX & project.buildSettings.architecture == "arm64") {
  target = macosArm64("native")
- } else if (project.currentOs.linux & project.buildSettings.architecture == "x86_64") {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().linux & project.buildSettings.architecture == "x86_64") {
  target = linuxX64("native")
- } else if (project.currentOs.linux & project.buildSettings.architecture == "arm64") {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().linux & project.buildSettings.architecture == "arm64") {
  target = linuxArm64("native")
- } else if (project.currentOs.windows) {
+ } else if (DefaultNativePlatform.getCurrentOperatingSystem().windows) {
  target = mingwX64("native")
  } else {
  throw new Exception("Unsupported platform! Check project settings.")