Pass SKIKO_VERSION setup in non-AOSP mode - #3307
Merged
Shagen Ogandzhanian (Schahen) merged 6 commits intoAug 17, 2026
Merged
Conversation
Igor Demin (igordmn)
requested changes
Aug 14, 2026
Igor Demin (igordmn)
approved these changes
Aug 14, 2026
Comment on lines
+36
to
+59
| String os = System.getProperty("os.name").toLowerCase(Locale.US) | ||
| String currentOsArtifact | ||
| if (os.contains("mac os x") || os.contains("darwin") || os.contains("osx")) { | ||
| def arch = System.getProperty("os.arch") | ||
| if (arch == "aarch64") { | ||
| currentOsArtifact = "skiko-awt-runtime-macos-arm64" | ||
| } else { | ||
| currentOsArtifact = "skiko-awt-runtime-macos-x64" | ||
| } | ||
| } else if (os.startsWith("win")) { | ||
| currentOsArtifact = "skiko-awt-runtime-windows-x64" | ||
| } else if (os.startsWith("linux")) { | ||
| def arch = System.getProperty("os.arch") | ||
| if (arch == "aarch64") { | ||
| currentOsArtifact = "skiko-awt-runtime-linux-arm64" | ||
| } else { | ||
| currentOsArtifact = "skiko-awt-runtime-linux-x64" | ||
| } | ||
| } else { | ||
| throw new GradleException("Unsupported operating system $os") | ||
| } | ||
| library("skikoCurrentOs", "org.jetbrains.skiko", | ||
| currentOsArtifact).versionRef("skiko") | ||
| } |
Collaborator
There was a problem hiding this comment.
Suggested change
| String os = System.getProperty("os.name").toLowerCase(Locale.US) | |
| String currentOsArtifact | |
| if (os.contains("mac os x") || os.contains("darwin") || os.contains("osx")) { | |
| def arch = System.getProperty("os.arch") | |
| if (arch == "aarch64") { | |
| currentOsArtifact = "skiko-awt-runtime-macos-arm64" | |
| } else { | |
| currentOsArtifact = "skiko-awt-runtime-macos-x64" | |
| } | |
| } else if (os.startsWith("win")) { | |
| currentOsArtifact = "skiko-awt-runtime-windows-x64" | |
| } else if (os.startsWith("linux")) { | |
| def arch = System.getProperty("os.arch") | |
| if (arch == "aarch64") { | |
| currentOsArtifact = "skiko-awt-runtime-linux-arm64" | |
| } else { | |
| currentOsArtifact = "skiko-awt-runtime-linux-x64" | |
| } | |
| } else { | |
| throw new GradleException("Unsupported operating system $os") | |
| } | |
| library("skikoCurrentOs", "org.jetbrains.skiko", | |
| currentOsArtifact).versionRef("skiko") | |
| } |
skikoCurrentOs was replaced by a fat jar recently, so it is better if we remove it now.
Collaborator
There was a problem hiding this comment.
Shagen Ogandzhanian (@Schahen), we need to remove not only library("skikoCurrentOs" but all the code I marked
Shagen Ogandzhanian (Schahen)
deleted the
sh/pass_skiko_version_env_variable
branch
August 17, 2026 09:09
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The goal of this PR is to restore the behaviour of skiko version resolution in non-AOSP mode
Testing
Launch any run configuration with SKIKO_VERSION set
Release Notes
N/A