-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move FatFrameworkConfiguration back to main plugin to temporarily fix…
… configuration cache.
- Loading branch information
1 parent
fa596ee
commit 1704c2a
Showing
11 changed files
with
74 additions
and
62 deletions.
There are no files selected for viewing
This file contains 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
25 changes: 25 additions & 0 deletions
25
...kie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package co.touchlab.skie.plugin.util | ||
|
|
||
| data class DarwinTarget( | ||
| // val konanTarget: KonanTarget, | ||
| val konanTargetName: String, | ||
| val targetTriple: TargetTriple, | ||
| val sdk: String, | ||
| ) { | ||
|
|
||
| constructor( | ||
| // konanTarget: KonanTarget, | ||
| konanTargetName: String, | ||
| targetTripleString: String, | ||
| sdk: String, | ||
| ) : this( | ||
| // konanTarget, | ||
| konanTargetName, | ||
| TargetTriple.fromString(targetTripleString), sdk, | ||
| ) | ||
|
|
||
| companion object { | ||
|
|
||
| lateinit var allTargets: Map<String, DarwinTarget> | ||
| } | ||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
28 changes: 0 additions & 28 deletions
28
...him-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,3 @@ | ||
| package co.touchlab.skie.plugin.util | ||
|
|
||
| import org.jetbrains.kotlin.gradle.tasks.FrameworkDescriptor | ||
| import org.jetbrains.kotlin.konan.target.KonanTarget | ||
|
|
||
| internal data class DarwinTarget( | ||
| val konanTarget: KonanTarget, | ||
| val targetTriple: TargetTriple, | ||
| val sdk: String, | ||
| ) { | ||
|
|
||
| constructor( | ||
| konanTarget: KonanTarget, | ||
| targetTripleString: String, | ||
| sdk: String, | ||
| ) : this(konanTarget, TargetTriple.fromString(targetTripleString), sdk) | ||
|
|
||
| companion object { | ||
|
|
||
| val allTargets: Map<String, DarwinTarget> = getAllSupportedDarwinTargets().associateBy { it.konanTarget.name } | ||
| } | ||
| } | ||
|
|
||
| internal expect fun getAllSupportedDarwinTargets(): List<DarwinTarget> | ||
|
|
||
| internal val FrameworkDescriptor.darwinTarget: DarwinTarget | ||
| get() = target.darwinTarget | ||
|
|
||
| internal val KonanTarget.darwinTarget: DarwinTarget | ||
| // We can't use `KotlinTarget` directly as the instance can differ when Gradle Configuration Cache is used | ||
| get() = DarwinTarget.allTargets[name] ?: error("Unknown konan target: $this") |
This file contains 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
File renamed without changes.
11 changes: 11 additions & 0 deletions
11
SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package co.touchlab.skie.plugin.util | ||
|
|
||
| import org.jetbrains.kotlin.gradle.tasks.FrameworkDescriptor | ||
| import org.jetbrains.kotlin.konan.target.KonanTarget | ||
|
|
||
| internal val FrameworkDescriptor.darwinTarget: DarwinTarget | ||
| get() = target.darwinTarget | ||
|
|
||
| internal val KonanTarget.darwinTarget: DarwinTarget | ||
| // We can't use `KotlinTarget` directly as the instance can differ when Gradle Configuration Cache is used | ||
| get() = DarwinTarget.allTargets[name] ?: error("Unknown konan target: $this") |
File renamed without changes.