diff --git a/SKIE/.run/1.8.0_Tests_Acceptance_All.run.xml b/SKIE/.run/1.8.0_Tests_Acceptance_All.run.xml
index 7dfa8e2af..455efdb0d 100644
--- a/SKIE/.run/1.8.0_Tests_Acceptance_All.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Acceptance_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Acceptance_Failed.run.xml b/SKIE/.run/1.8.0_Tests_Acceptance_Failed.run.xml
index 6afd0fe52..b2636178d 100644
--- a/SKIE/.run/1.8.0_Tests_Acceptance_Failed.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Acceptance_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Acceptance_Selected.run.xml b/SKIE/.run/1.8.0_Tests_Acceptance_Selected.run.xml
index 1a7c82db0..14b0b77a4 100644
--- a/SKIE/.run/1.8.0_Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Acceptance_Selected.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Libraries_All.run.xml b/SKIE/.run/1.8.0_Tests_Libraries_All.run.xml
index 5d6553d2e..52402c707 100644
--- a/SKIE/.run/1.8.0_Tests_Libraries_All.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Libraries_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Libraries_Compare.run.xml b/SKIE/.run/1.8.0_Tests_Libraries_Compare.run.xml
index 24aa81e0d..3f34df21d 100644
--- a/SKIE/.run/1.8.0_Tests_Libraries_Compare.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Libraries_Compare.run.xml
@@ -10,8 +10,8 @@
diff --git a/SKIE/.run/1.8.0_Tests_Libraries_Failed.run.xml b/SKIE/.run/1.8.0_Tests_Libraries_Failed.run.xml
index 255c83101..861de16a6 100644
--- a/SKIE/.run/1.8.0_Tests_Libraries_Failed.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Libraries_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/1.8.0_Tests_Libraries_Selected Library.run.xml
index 5d9e6dac0..4d31b27aa 100644
--- a/SKIE/.run/1.8.0_Tests_Libraries_Selected Library.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Libraries_Selected Library.run.xml
@@ -16,7 +16,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/1.8.0_Tests_Libraries_Stdlib.run.xml
index 328252fe3..dbbf3885a 100644
--- a/SKIE/.run/1.8.0_Tests_Libraries_Stdlib.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Libraries_Stdlib.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/1.8.0_Tests_Libraries_Without SKIE.run.xml
index bb0bde2a3..2db636758 100644
--- a/SKIE/.run/1.8.0_Tests_Libraries_Without SKIE.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Libraries_Without SKIE.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.0_Tests_Types_All.run.xml b/SKIE/.run/1.8.0_Tests_Types_All.run.xml
index 6a1a9d24d..ec87fdf70 100644
--- a/SKIE/.run/1.8.0_Tests_Types_All.run.xml
+++ b/SKIE/.run/1.8.0_Tests_Types_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Acceptance_All.run.xml b/SKIE/.run/1.8.20_Tests_Acceptance_All.run.xml
index dbef1d7a3..a76f29dbb 100644
--- a/SKIE/.run/1.8.20_Tests_Acceptance_All.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Acceptance_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Acceptance_Failed.run.xml b/SKIE/.run/1.8.20_Tests_Acceptance_Failed.run.xml
index f74388b28..3f3706946 100644
--- a/SKIE/.run/1.8.20_Tests_Acceptance_Failed.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Acceptance_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Acceptance_Selected.run.xml b/SKIE/.run/1.8.20_Tests_Acceptance_Selected.run.xml
index 7661fd26a..89038c5db 100644
--- a/SKIE/.run/1.8.20_Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Acceptance_Selected.run.xml
@@ -15,7 +15,7 @@
@@ -26,4 +26,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/1.8.20_Tests_Libraries_All.run.xml b/SKIE/.run/1.8.20_Tests_Libraries_All.run.xml
index 090856e42..8c040e8d2 100644
--- a/SKIE/.run/1.8.20_Tests_Libraries_All.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Libraries_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Libraries_Compare.run.xml b/SKIE/.run/1.8.20_Tests_Libraries_Compare.run.xml
index e34f96e13..405957312 100644
--- a/SKIE/.run/1.8.20_Tests_Libraries_Compare.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Libraries_Compare.run.xml
@@ -10,8 +10,8 @@
diff --git a/SKIE/.run/1.8.20_Tests_Libraries_Failed.run.xml b/SKIE/.run/1.8.20_Tests_Libraries_Failed.run.xml
index 43bf2e4ad..641ceca5f 100644
--- a/SKIE/.run/1.8.20_Tests_Libraries_Failed.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Libraries_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/1.8.20_Tests_Libraries_Selected Library.run.xml
index 28b58010b..e2a73f85d 100644
--- a/SKIE/.run/1.8.20_Tests_Libraries_Selected Library.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Libraries_Selected Library.run.xml
@@ -16,7 +16,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/1.8.20_Tests_Libraries_Stdlib.run.xml
index cadb0eb4e..438315150 100644
--- a/SKIE/.run/1.8.20_Tests_Libraries_Stdlib.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Libraries_Stdlib.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/1.8.20_Tests_Libraries_Without SKIE.run.xml
index 33b55bf0b..d67d2de64 100644
--- a/SKIE/.run/1.8.20_Tests_Libraries_Without SKIE.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Libraries_Without SKIE.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.8.20_Tests_Types_All.run.xml b/SKIE/.run/1.8.20_Tests_Types_All.run.xml
index a98bae3a7..9162d9226 100644
--- a/SKIE/.run/1.8.20_Tests_Types_All.run.xml
+++ b/SKIE/.run/1.8.20_Tests_Types_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Acceptance_All.run.xml b/SKIE/.run/1.9.0_Tests_Acceptance_All.run.xml
index 006ee0b8b..aedaf546a 100644
--- a/SKIE/.run/1.9.0_Tests_Acceptance_All.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Acceptance_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Acceptance_Failed.run.xml b/SKIE/.run/1.9.0_Tests_Acceptance_Failed.run.xml
index f881f02ac..517f8a66e 100644
--- a/SKIE/.run/1.9.0_Tests_Acceptance_Failed.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Acceptance_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Acceptance_Selected.run.xml b/SKIE/.run/1.9.0_Tests_Acceptance_Selected.run.xml
index 79ac4a99c..b432a0532 100644
--- a/SKIE/.run/1.9.0_Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Acceptance_Selected.run.xml
@@ -15,7 +15,7 @@
@@ -26,4 +26,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/1.9.0_Tests_Libraries_All.run.xml b/SKIE/.run/1.9.0_Tests_Libraries_All.run.xml
index 38fbc0e2e..770cf43e4 100644
--- a/SKIE/.run/1.9.0_Tests_Libraries_All.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Libraries_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Libraries_Compare.run.xml b/SKIE/.run/1.9.0_Tests_Libraries_Compare.run.xml
index d70415749..b1e3b767a 100644
--- a/SKIE/.run/1.9.0_Tests_Libraries_Compare.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Libraries_Compare.run.xml
@@ -10,8 +10,8 @@
diff --git a/SKIE/.run/1.9.0_Tests_Libraries_Failed.run.xml b/SKIE/.run/1.9.0_Tests_Libraries_Failed.run.xml
index 06e1b9202..0768aad91 100644
--- a/SKIE/.run/1.9.0_Tests_Libraries_Failed.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Libraries_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/1.9.0_Tests_Libraries_Selected Library.run.xml
index 7c3b7fe52..e24d688fc 100644
--- a/SKIE/.run/1.9.0_Tests_Libraries_Selected Library.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Libraries_Selected Library.run.xml
@@ -16,7 +16,7 @@
@@ -27,4 +27,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/1.9.0_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/1.9.0_Tests_Libraries_Stdlib.run.xml
index 82f0c6fca..013d65d64 100644
--- a/SKIE/.run/1.9.0_Tests_Libraries_Stdlib.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Libraries_Stdlib.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/1.9.0_Tests_Libraries_Without SKIE.run.xml
index 7c8997850..4a29122e4 100644
--- a/SKIE/.run/1.9.0_Tests_Libraries_Without SKIE.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Libraries_Without SKIE.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.0_Tests_Types_All.run.xml b/SKIE/.run/1.9.0_Tests_Types_All.run.xml
index 81ddcc3f7..cd8108f0e 100644
--- a/SKIE/.run/1.9.0_Tests_Types_All.run.xml
+++ b/SKIE/.run/1.9.0_Tests_Types_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Acceptance_All.run.xml b/SKIE/.run/1.9.20_Tests_Acceptance_All.run.xml
index f64750cb5..549f2f43b 100644
--- a/SKIE/.run/1.9.20_Tests_Acceptance_All.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Acceptance_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Acceptance_Failed.run.xml b/SKIE/.run/1.9.20_Tests_Acceptance_Failed.run.xml
index 718e70a66..c397fcb91 100644
--- a/SKIE/.run/1.9.20_Tests_Acceptance_Failed.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Acceptance_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Acceptance_Selected.run.xml b/SKIE/.run/1.9.20_Tests_Acceptance_Selected.run.xml
index ce990be8b..c8fa2b010 100644
--- a/SKIE/.run/1.9.20_Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Acceptance_Selected.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_All.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_All.run.xml
index f56abe79f..04ca39691 100644
--- a/SKIE/.run/1.9.20_Tests_Libraries_All.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Libraries_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Compare.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Compare.run.xml
index 145422565..20e4233ef 100644
--- a/SKIE/.run/1.9.20_Tests_Libraries_Compare.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Libraries_Compare.run.xml
@@ -10,8 +10,8 @@
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Failed.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Failed.run.xml
index de915bcb0..e7525e840 100644
--- a/SKIE/.run/1.9.20_Tests_Libraries_Failed.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Libraries_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Selected Library.run.xml
index dedfa743c..4c9761344 100644
--- a/SKIE/.run/1.9.20_Tests_Libraries_Selected Library.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Libraries_Selected Library.run.xml
@@ -16,7 +16,7 @@
@@ -27,4 +27,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Stdlib.run.xml
index 160eaa3c5..fafa13f11 100644
--- a/SKIE/.run/1.9.20_Tests_Libraries_Stdlib.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Libraries_Stdlib.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/1.9.20_Tests_Libraries_Without SKIE.run.xml
index 84d8d4559..0ed7b9241 100644
--- a/SKIE/.run/1.9.20_Tests_Libraries_Without SKIE.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Libraries_Without SKIE.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/1.9.20_Tests_Types_All.run.xml b/SKIE/.run/1.9.20_Tests_Types_All.run.xml
index 20de19313..872bb7908 100644
--- a/SKIE/.run/1.9.20_Tests_Types_All.run.xml
+++ b/SKIE/.run/1.9.20_Tests_Types_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/2.0.0_Tests_Acceptance_All.run.xml b/SKIE/.run/2.0.0_Tests_Acceptance_All.run.xml
index 698ca2e2d..c709c0d0a 100644
--- a/SKIE/.run/2.0.0_Tests_Acceptance_All.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Acceptance_All.run.xml
@@ -10,7 +10,7 @@
@@ -21,4 +21,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Acceptance_Failed.run.xml b/SKIE/.run/2.0.0_Tests_Acceptance_Failed.run.xml
index e91d2dd03..c9e2ae6c5 100644
--- a/SKIE/.run/2.0.0_Tests_Acceptance_Failed.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Acceptance_Failed.run.xml
@@ -15,7 +15,7 @@
@@ -26,4 +26,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Acceptance_Selected.run.xml b/SKIE/.run/2.0.0_Tests_Acceptance_Selected.run.xml
index 0a4c754aa..c0bfaf30c 100644
--- a/SKIE/.run/2.0.0_Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Acceptance_Selected.run.xml
@@ -3,19 +3,19 @@
-
+
diff --git a/SKIE/.run/2.0.0_Tests_Libraries_All.run.xml b/SKIE/.run/2.0.0_Tests_Libraries_All.run.xml
index e5bdd3abc..215e5857b 100644
--- a/SKIE/.run/2.0.0_Tests_Libraries_All.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Libraries_All.run.xml
@@ -10,7 +10,7 @@
@@ -21,4 +21,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Libraries_Compare.run.xml b/SKIE/.run/2.0.0_Tests_Libraries_Compare.run.xml
index 96c946d17..1e5d609f0 100644
--- a/SKIE/.run/2.0.0_Tests_Libraries_Compare.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Libraries_Compare.run.xml
@@ -10,8 +10,8 @@
@@ -23,4 +23,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Libraries_Failed.run.xml b/SKIE/.run/2.0.0_Tests_Libraries_Failed.run.xml
index 5bef9c931..98ba25e4a 100644
--- a/SKIE/.run/2.0.0_Tests_Libraries_Failed.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Libraries_Failed.run.xml
@@ -15,7 +15,7 @@
@@ -26,4 +26,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/2.0.0_Tests_Libraries_Selected Library.run.xml
index 0fc60b8aa..82defd7a6 100644
--- a/SKIE/.run/2.0.0_Tests_Libraries_Selected Library.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Libraries_Selected Library.run.xml
@@ -16,7 +16,7 @@
@@ -27,4 +27,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/2.0.0_Tests_Libraries_Stdlib.run.xml
index b42c513f0..b6bfc717b 100644
--- a/SKIE/.run/2.0.0_Tests_Libraries_Stdlib.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Libraries_Stdlib.run.xml
@@ -10,7 +10,7 @@
@@ -21,4 +21,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/2.0.0_Tests_Libraries_Without SKIE.run.xml
index 00e118b2d..79dc155a2 100644
--- a/SKIE/.run/2.0.0_Tests_Libraries_Without SKIE.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Libraries_Without SKIE.run.xml
@@ -10,7 +10,7 @@
@@ -21,4 +21,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/2.0.0_Tests_Types_All.run.xml b/SKIE/.run/2.0.0_Tests_Types_All.run.xml
index 21d0f86ec..f4affc8a8 100644
--- a/SKIE/.run/2.0.0_Tests_Types_All.run.xml
+++ b/SKIE/.run/2.0.0_Tests_Types_All.run.xml
@@ -10,7 +10,7 @@
@@ -21,4 +21,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/Latest_Tests_Acceptance_All.run.xml b/SKIE/.run/Latest_Tests_Acceptance_All.run.xml
index 4e779ab1e..8abc6f1d7 100644
--- a/SKIE/.run/Latest_Tests_Acceptance_All.run.xml
+++ b/SKIE/.run/Latest_Tests_Acceptance_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/Latest_Tests_Acceptance_Failed.run.xml b/SKIE/.run/Latest_Tests_Acceptance_Failed.run.xml
index 5cf214f9d..027de71f5 100644
--- a/SKIE/.run/Latest_Tests_Acceptance_Failed.run.xml
+++ b/SKIE/.run/Latest_Tests_Acceptance_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/Latest_Tests_Libraries_All.run.xml b/SKIE/.run/Latest_Tests_Libraries_All.run.xml
index a41ada985..757282e7e 100644
--- a/SKIE/.run/Latest_Tests_Libraries_All.run.xml
+++ b/SKIE/.run/Latest_Tests_Libraries_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/Latest_Tests_Libraries_Compare.run.xml b/SKIE/.run/Latest_Tests_Libraries_Compare.run.xml
index 7c4153810..67affd57f 100644
--- a/SKIE/.run/Latest_Tests_Libraries_Compare.run.xml
+++ b/SKIE/.run/Latest_Tests_Libraries_Compare.run.xml
@@ -10,9 +10,9 @@
diff --git a/SKIE/.run/Latest_Tests_Libraries_Failed.run.xml b/SKIE/.run/Latest_Tests_Libraries_Failed.run.xml
index 3df4a580e..6e15e7526 100644
--- a/SKIE/.run/Latest_Tests_Libraries_Failed.run.xml
+++ b/SKIE/.run/Latest_Tests_Libraries_Failed.run.xml
@@ -15,7 +15,7 @@
diff --git a/SKIE/.run/Latest_Tests_Libraries_Selected Library.run.xml b/SKIE/.run/Latest_Tests_Libraries_Selected Library.run.xml
index 5e7d74249..09296a75b 100644
--- a/SKIE/.run/Latest_Tests_Libraries_Selected Library.run.xml
+++ b/SKIE/.run/Latest_Tests_Libraries_Selected Library.run.xml
@@ -16,7 +16,7 @@
diff --git a/SKIE/.run/Latest_Tests_Libraries_Stdlib.run.xml b/SKIE/.run/Latest_Tests_Libraries_Stdlib.run.xml
index d6b5a77a8..2a4a57a39 100644
--- a/SKIE/.run/Latest_Tests_Libraries_Stdlib.run.xml
+++ b/SKIE/.run/Latest_Tests_Libraries_Stdlib.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/Latest_Tests_Libraries_Without SKIE.run.xml b/SKIE/.run/Latest_Tests_Libraries_Without SKIE.run.xml
index a770cecda..5848c5afa 100644
--- a/SKIE/.run/Latest_Tests_Libraries_Without SKIE.run.xml
+++ b/SKIE/.run/Latest_Tests_Libraries_Without SKIE.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/Latest_Tests_Types_All.run.xml b/SKIE/.run/Latest_Tests_Types_All.run.xml
index 98eaea89c..f9ece750a 100644
--- a/SKIE/.run/Latest_Tests_Types_All.run.xml
+++ b/SKIE/.run/Latest_Tests_Types_All.run.xml
@@ -10,7 +10,7 @@
diff --git a/SKIE/.run/Tests_Acceptance_Selected.run.xml b/SKIE/.run/Tests_Acceptance_Selected.run.xml
index 9bfaaa1af..53979f505 100644
--- a/SKIE/.run/Tests_Acceptance_Selected.run.xml
+++ b/SKIE/.run/Tests_Acceptance_Selected.run.xml
@@ -3,7 +3,7 @@
@@ -15,7 +15,7 @@
@@ -26,4 +26,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/.run/Util_Reformat Functional tests packages.run.xml b/SKIE/.run/Util_Reformat Functional tests packages.run.xml
index 9fc7ef0d8..aa597b7f9 100644
--- a/SKIE/.run/Util_Reformat Functional tests packages.run.xml
+++ b/SKIE/.run/Util_Reformat Functional tests packages.run.xml
@@ -10,7 +10,7 @@
@@ -21,4 +21,4 @@
false
-
\ No newline at end of file
+
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
index f2feb3ad3..9b0be3da1 160000
--- a/SKIE/acceptance-tests
+++ b/SKIE/acceptance-tests
@@ -1 +1 @@
-Subproject commit f2feb3ad3bd4880a98a7d4383cb91d0e3d15539c
+Subproject commit 9b0be3da1f8347da2d0cb5ceaaa62cbc05dd9c8c
diff --git a/SKIE/common/configuration/annotations/configuration-annotations.gradle.kts b/SKIE/common/configuration/annotations/configuration-annotations.gradle.kts
index 50a60ee9c..4e1ca487a 100644
--- a/SKIE/common/configuration/annotations/configuration-annotations.gradle.kts
+++ b/SKIE/common/configuration/annotations/configuration-annotations.gradle.kts
@@ -1,19 +1,358 @@
-import co.touchlab.skie.gradle.publish.publishCode
+@file:Suppress("invisible_reference", "invisible_member")
+import co.touchlab.skie.buildsetup.tasks.BuildNestedGradle
+import co.touchlab.skie.gradle.KotlinCompilerVersion
+import co.touchlab.skie.gradle.KotlinToolingVersion
+import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
+import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.tooling.GradleConnector
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
plugins {
id("skie.runtime")
- id("skie.publishable")
+// id("skie.publishable")
}
-skiePublishing {
- name = "SKIE Configuration Annotations"
- description = "Annotations to configure SKIE behavior."
- publishSources = true
+// skiePublishing {
+// name = "SKIE Configuration Annotations"
+// description = "Annotations to configure SKIE behavior."
+// publishSources = true
+// }
+
+enum class SupportedAnnotationTarget(
+ val targetName: String,
+ val platformType: KotlinPlatformType = KotlinPlatformType.native,
+) {
+ Jvm("jvm", KotlinPlatformType.jvm),
+ Js("js", KotlinPlatformType.js),
+ AndroidNativeArm32("android_native_arm32"),
+ AndroidNativeArm64("android_native_arm64"),
+ AndroidNativeX86("android_native_x86"),
+ AndroidNativeX64("android_native_x64"),
+
+ IosArm32("ios_arm32"),
+ IosArm64("ios_arm64"),
+ IosX64("ios_x64"),
+ IosSimulatorArm64("ios_simulator_arm64"),
+
+ WatchosArm32("watchos_arm32"),
+ WatchosArm64("watchos_arm64"),
+ WatchosX86("watchos_x86"),
+ WatchosX64("watchos_x64"),
+ WatchosSimulatorArm64("watchos_simulator_arm64"),
+ WatchosDeviceArm64("watchos_device_arm64"),
+
+ TvosArm64("tvos_arm64"),
+ TvosX64("tvos_x64"),
+ TvosSimulatorArm64("tvos_simulator_arm64"),
+
+ MacosX64("macos_x64"),
+ MacosArm64("macos_arm64"),
+
+ LinuxArm64("linux_arm64"),
+ LinuxArm32Hfp("linux_arm32_hfp"),
+ LinuxX64("linux_x64"),
+
+ MingwX64("mingw_x64"),
+ MingwX86("mingw_x86"),
+
+ Wasm32("wasm32"),
+}
+
+val kotlin_1_8_0 = KotlinToolingVersion("1.8.0")
+val kotlin_1_8_20 = KotlinToolingVersion("1.8.20")
+val kotlin_1_9_0 = KotlinToolingVersion("1.9.0")
+val kotlin_1_9_20 = KotlinToolingVersion("1.9.20")
+val kotlin_2_0_0 = KotlinToolingVersion("2.0.0")
+
+fun SupportedAnnotationTarget.getTargetDeclaration(kotlinVersion: KotlinToolingVersion): String? {
+ return when (this) {
+ SupportedAnnotationTarget.Jvm -> "jvm()"
+ SupportedAnnotationTarget.Js -> if (kotlinVersion >= kotlin_1_9_0) {
+ """
+ js {
+ browser()
+ nodejs()
+ }
+ """.trimIndent()
+ } else {
+ """
+ js(BOTH) {
+ browser()
+ nodejs()
+ }
+ """.trimIndent()
+ }
+ SupportedAnnotationTarget.AndroidNativeArm32 -> "androidNativeArm32()"
+ SupportedAnnotationTarget.AndroidNativeArm64 -> "androidNativeArm64()"
+ SupportedAnnotationTarget.AndroidNativeX86 -> "androidNativeX86()"
+ SupportedAnnotationTarget.AndroidNativeX64 -> "androidNativeX64()"
+ SupportedAnnotationTarget.IosArm32 -> "iosArm32()".takeUnless { kotlinVersion >= kotlin_1_9_20 }
+ SupportedAnnotationTarget.IosArm64 -> "iosArm64()"
+ SupportedAnnotationTarget.IosX64 -> "iosX64()"
+ SupportedAnnotationTarget.IosSimulatorArm64 -> "iosSimulatorArm64()"
+ SupportedAnnotationTarget.WatchosArm32 -> "watchosArm32()"
+ SupportedAnnotationTarget.WatchosArm64 -> "watchosArm64()"
+ SupportedAnnotationTarget.WatchosX86 -> "watchosX86()".takeUnless { kotlinVersion >= kotlin_1_9_20 }
+ SupportedAnnotationTarget.WatchosX64 -> "watchosX64()"
+ SupportedAnnotationTarget.WatchosSimulatorArm64 -> "watchosSimulatorArm64()"
+ SupportedAnnotationTarget.WatchosDeviceArm64 -> "watchosDeviceArm64()"
+ SupportedAnnotationTarget.TvosArm64 -> "tvosArm64()"
+ SupportedAnnotationTarget.TvosX64 -> "tvosX64()"
+ SupportedAnnotationTarget.TvosSimulatorArm64 -> "tvosSimulatorArm64()"
+ SupportedAnnotationTarget.MacosX64 -> "macosX64()"
+ SupportedAnnotationTarget.MacosArm64 -> "macosArm64()"
+ SupportedAnnotationTarget.LinuxArm64 -> "linuxArm64()"
+ SupportedAnnotationTarget.LinuxArm32Hfp -> "linuxArm32Hfp()"
+ SupportedAnnotationTarget.LinuxX64 -> "linuxX64()"
+ SupportedAnnotationTarget.MingwX64 -> "mingwX64()"
+ SupportedAnnotationTarget.MingwX86 -> "mingwX86()".takeUnless { kotlinVersion >= kotlin_1_9_20 }
+ SupportedAnnotationTarget.Wasm32 -> "wasm32()".takeUnless { kotlinVersion >= kotlin_1_9_20 }
+ }
+}
+
+
+val smokeTestTmpRepositoryPath: String? by project
+val publishTaskNames = listOfNotNull(
+ "publishToMavenLocal" to listOf("publishToMavenLocal"),
+ "publishToSonatype" to listOf("findSonatypeStagingRepository", "publishToSonatype"),
+ if (smokeTestTmpRepositoryPath != null) {
+ "publishAllPublicationsToSmokeTestTmpRepository" to listOf("publishAllPublicationsToSmokeTestTmpRepository")
+ } else {
+ null
+ },
+)
+
+val publishTaskNamesWithTasks = publishTaskNames.associateWith { (publishTaskName, _) ->
+ tasks.register(publishTaskName)
+}
+
+fun setupRootTasks() {
+ val rootKotlinVersion = kotlin_1_8_20
+ val supportedTargetsWithDeclarations = SupportedAnnotationTarget.values().mapNotNull { target ->
+ target.getTargetDeclaration(rootKotlinVersion)?.let {
+ target to it
+ }
+ }
+ val copyRootProjectTask = tasks.register("copyProject__root") {
+ from(layout.projectDirectory.dir("impl")) {
+ include("src/**", "build.gradle.kts", "gradle.properties", "settings.gradle.kts")
+ filter(
+ ReplaceTokens::class,
+ "tokens" to mapOf(
+ "targetKotlinVersion" to rootKotlinVersion.toString(),
+ "artifactIdSuffix" to "",
+ "targets" to supportedTargetsWithDeclarations.joinToString("\n") { (_, declaration) -> declaration },
+ // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+ // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+ "dependencies" to if (rootKotlinVersion == kotlin_1_8_0) {
+ "implementation(libs.kotlinx.coroutines.core.legacy)"
+ } else {
+ "implementation(libs.kotlinx.coroutines.core)"
+ },
+ "smokeTestTmpRepositoryConfiguration" to smokeTestTmpRepositoryPath?.let {
+ """
+ publishing {
+ repositories {
+ maven {
+ url = uri("$it")
+ name = "smokeTestTmp"
+ }
+ }
+ }
+ """.trimIndent()
+ }.orEmpty(),
+ )
+ )
+ }
+ into(layout.buildDirectory.dir("configuration_annotations_impl_root"))
+ }
+
+ publishTaskNamesWithTasks.forEach { (publishTaskNames, parentPublishTask) ->
+ val (publishTaskName, publishTasks) = publishTaskNames
+ val publishTask = tasks.register("${publishTaskName}__root") {
+ group = "publishing"
+
+ dependsOn(copyRootProjectTask)
+
+ projectDir.fileProvider(copyRootProjectTask.map { it.destinationDir })
+
+ tasks.set(publishTasks)
+ }
+
+ parentPublishTask.configure {
+ dependsOn(publishTask)
+ }
+ }
+}
+
+setupRootTasks()
+
+kotlinToolingVersionDimension().components.forEach { kotlinToolingVersion ->
+ val pathSafeKotlinVersionName = kotlinToolingVersion.primaryVersion.toString().replace('.', '_')
+ val supportedTargetsWithDeclarations = SupportedAnnotationTarget.values().mapNotNull { target ->
+ target.getTargetDeclaration(kotlinToolingVersion.primaryVersion)?.let {
+ target to it
+ }
+ }
+
+ val copyProjectTask = tasks.register("copyProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+ description = "Copies implementation for Kotlin ${kotlinToolingVersion.primaryVersion}."
+
+ from(layout.projectDirectory.dir("impl")) {
+ include("src/**", "build.gradle.kts", "gradle.properties", "settings.gradle.kts")
+ filter(
+ ReplaceTokens::class,
+ "tokens" to mapOf(
+ "targetKotlinVersion" to kotlinToolingVersion.primaryVersion.toString(),
+ "artifactIdSuffix" to "-${kotlinToolingVersion.primaryVersion}",
+ "targets" to supportedTargetsWithDeclarations.joinToString("\n") { (_, declaration) -> declaration },
+ // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+ // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+ "dependencies" to if (kotlinToolingVersion.primaryVersion == kotlin_1_8_0) {
+ "implementation(libs.kotlinx.coroutines.core.legacy)"
+ } else {
+ "implementation(libs.kotlinx.coroutines.core)"
+ },
+ "smokeTestTmpRepositoryConfiguration" to smokeTestTmpRepositoryPath?.let {
+ """
+ publishing {
+ repositories {
+ maven {
+ url = uri("$it")
+ name = "smokeTestTmp"
+ }
+ }
+ }
+ """.trimIndent()
+ }.orEmpty(),
+ )
+ )
+ }
+ into(layout.buildDirectory.dir("configuration_annotations_impl_$pathSafeKotlinVersionName"))
+ }
+
+ val buildTask = tasks.register("buildProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+ group = "build"
+
+ dependsOn(copyProjectTask)
+
+ projectDir.fileProvider(copyProjectTask.map { it.destinationDir })
+
+ tasks.set(
+ supportedTargetsWithDeclarations.flatMap { (target, _) ->
+ listOf(
+ "generateMetadataFileFor${target.name}Publication",
+ "generatePomFileFor${target.name}Publication",
+ )
+ } + listOf(
+ "generateMetadataFileForKotlinMultiplatformPublication",
+ "generatePomFileForKotlinMultiplatformPublication",
+ )
+ )
+ }
+
+ publishTaskNamesWithTasks.forEach { (publishTaskNames, parentPublishTask) ->
+ val (publishTaskName, publishTasks) = publishTaskNames
+ val publishTask = tasks.register("${publishTaskName}__kgp_${kotlinToolingVersion.primaryVersion}") {
+ group = "publishing"
+
+ dependsOn(copyProjectTask)
+
+ projectDir.fileProvider(copyProjectTask.map { it.destinationDir })
+
+ tasks.set(publishTasks)
+ }
+
+ parentPublishTask.configure {
+ dependsOn(publishTask)
+ }
+ }
+
+
+// if (kotlinToolingVersion.primaryVersion == kotlin_2_0_0) {
+// val configuration = configurations.create("jvm__kgp_${kotlinToolingVersion.primaryVersion}") {
+// isCanBeConsumed = true
+// isCanBeResolved = false
+//
+// attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class.java, Category.LIBRARY))
+// attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
+// attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.STANDARD_JVM))
+// // attribute(KotlinNativeTarget.konanTargetAttribute, target.targetName)
+// attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.primaryVersion.toString()))
+// }
+// }
+//
+// val klibPath = "impl_$pathSafeKotlinVersionName/build/classes/kotlin/jvm/main/klib/skie-kotlin-runtime.klib"
+//
+// artifacts.add(configuration.name, layout.buildDirectory.file(klibPath)) {
+// builtBy(buildTask)
+//
+// }
+// }
+
+// if (kotlinToolingVersion.primaryVersion == kotlin_2_0_0) {
+// val metadataConfiguration = configurations.create("metadata__kgp_${kotlinToolingVersion.primaryVersion}") {
+// isCanBeConsumed = true
+// isCanBeResolved = false
+//
+// attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_METADATA))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+// attribute(KotlinPlatformType.attribute, KotlinPlatformType.common)
+// }
+// }
+//
+// val metadataArtifactPath = "configuration_annotations_impl_$pathSafeKotlinVersionName/build/libs/skie-configuration-annotations-${kotlinToolingVersion.primaryVersion}-metadata-${version}.jar"
+// artifacts.add(metadataConfiguration.name, layout.buildDirectory.file(metadataArtifactPath)) {
+// builtBy(buildTask)
+// }
+//
+// supportedTargetsWithDeclarations.forEach { (target, _) ->
+// val lowercaseTargetName = target.name.replaceFirstChar { it.lowercase() }
+// val configuration = configurations.create("${lowercaseTargetName}__kgp_${kotlinToolingVersion.primaryVersion}") {
+// isCanBeConsumed = true
+// isCanBeResolved = false
+//
+// attributes {
+// // attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_RUNTIME))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+// attribute(KotlinPlatformType.attribute, target.platformType)
+// attribute(
+// TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+// objects.named(
+// if (target.platformType == KotlinPlatformType.jvm) {
+// TargetJvmEnvironment.STANDARD_JVM
+// } else {
+// "non-jvm"
+// }
+// )
+// )
+// attribute(KotlinNativeTarget.konanTargetAttribute, target.targetName)
+// if (target.platformType != KotlinPlatformType.jvm) {
+// attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.primaryVersion.toString()))
+// }
+// }
+// }
+//
+// val artifactPath = if (target.platformType == KotlinPlatformType.jvm) {
+// "configuration_annotations_impl_$pathSafeKotlinVersionName/build/libs/skie-configuration-annotations-${kotlinToolingVersion.primaryVersion}-${target.name.lowercase()}-${version}.jar"
+// } else {
+// "configuration_annotations_impl_$pathSafeKotlinVersionName/build/classes/kotlin/${lowercaseTargetName}/main/klib/skie-configuration-annotations-${kotlinToolingVersion.primaryVersion}.klib"
+// }
+// artifacts.add(configuration.name, layout.buildDirectory.file(artifactPath)) {
+// builtBy(buildTask)
+// }
+// }
+// }
}
kotlin {
jvm()
- js(BOTH) {
+ js {
browser()
nodejs()
}
@@ -23,14 +362,12 @@ kotlin {
androidNativeX86()
androidNativeX64()
- iosArm32()
iosArm64()
iosX64()
iosSimulatorArm64()
watchosArm32()
watchosArm64()
- watchosX86()
watchosX64()
watchosSimulatorArm64()
watchosDeviceArm64()
@@ -43,11 +380,32 @@ kotlin {
macosArm64()
linuxArm64()
- linuxArm32Hfp()
linuxX64()
mingwX64()
- mingwX86()
- wasm32()
+ sourceSets.commonMain {
+ kotlin.srcDirs("impl/src/commonMain/kotlin")
+ }
}
+
+// afterEvaluate {
+// println("Components:")
+// components.forEach {
+// println("\t${it.name}")
+// }
+// }
+//
+// val p = project
+// project.launchInRequiredStage(KotlinPluginLifecycle.Stage.ReadyForExecution) {
+// println("Components: $p")
+// components.forEach { component ->
+// println("\t- ${component.name} - $component")
+// }
+//
+// println("Publications:")
+// publishing.publications.forEach { publication ->
+// println("\t- ${publication.name} - $publication")
+// }
+//
+// }
diff --git a/SKIE/common/configuration/annotations/impl/build.gradle.kts b/SKIE/common/configuration/annotations/impl/build.gradle.kts
new file mode 100644
index 000000000..49f22c233
--- /dev/null
+++ b/SKIE/common/configuration/annotations/impl/build.gradle.kts
@@ -0,0 +1,186 @@
+// @file:Suppress("invisible_reference", "invisible_member")
+// import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle
+// import org.jetbrains.kotlin.gradle.plugin.launchInRequiredStage
+import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
+
+plugins {
+// id("skie.runtime")
+ kotlin("multiplatform") version "@targetKotlinVersion@"
+ `maven-publish`
+ alias(libs.plugins.nexusPublish)
+}
+
+group = "co.touchlab.skie"
+version = System.getenv("RELEASE_VERSION").orEmpty().ifBlank { "1.0.0-SNAPSHOT" }
+
+nexusPublishing {
+ repositoryDescription = "$group:SKIE:$version"
+
+ this.repositories {
+ sonatype()
+ }
+}
+
+tasks.withType().configureEach {
+ isEnabled = false
+}
+
+// skiePublishing {
+// name = "SKIE Configuration Annotations"
+// description = "Annotations to configure SKIE behavior."
+// publishSources = true
+// }
+
+@smokeTestTmpRepositoryConfiguration@
+
+val isRelease = !version.toString().endsWith("SNAPSHOT")
+val isPublishing = gradle.startParameter.taskNames.contains("publishToSonatype")
+val shouldSign = isRelease && isPublishing
+if (shouldSign) {
+ apply()
+ val signing = extensions.getByType()
+ val signingKey: String? by project
+ val signingPassword: String? by project
+ if (!signingKey.isNullOrBlank()) {
+ signing.useInMemoryPgpKeys(signingKey, signingPassword)
+ }
+ publishing.publications.withType().configureEach {
+ signing.sign(this)
+ }
+}
+
+publishing {
+ publications.withType().configureEach {
+ pom {
+ name = "SKIE Configuration Annotations"
+ description = "Annotations to configure SKIE behavior."
+ url = "https://skie.touchlab.co"
+
+ licenses {
+ license {
+ name = "The Apache License, Version 2.0"
+ url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ }
+ }
+
+ developers {
+ listOf(
+ "Kevin Galligan" to "kevin@touchlab.co",
+ "Filip Dolnik" to "filip@touchlab.co",
+ "Tadeas Kriz" to "tadeas@touchlab.co",
+ ).forEach { (name, email) ->
+ developer {
+ this.name = name
+ this.email = email
+ organization = "Touchlab"
+ organizationUrl = "https://touchlab.co"
+ }
+ }
+ }
+
+ scm {
+ connection = "scm:git:git://github.com/touchlab/SKIE.git"
+ developerConnection = "scm:git:ssh://github.com:touchlab/SKIE.git"
+ url = "https://github.com/touchlab/SKIE"
+ }
+ }
+
+ val publication = this
+ val javadocJar = tasks.register("${publication.name}JavadocJar") {
+ archiveClassifier.set("javadoc")
+ // Each archive name should be distinct. Mirror the format for the sources Jar tasks.
+ archiveBaseName.set("${archiveBaseName.orNull ?: project.name}-${publication.name}")
+ }
+ artifact(javadocJar)
+ }
+}
+
+tasks.withType().configureEach {
+ compilerOptions {
+ freeCompilerArgs.addAll("-module-name", "co.touchlab.skie:configuration-annotations")
+ }
+}
+
+tasks.withType().configureEach {
+ compilerOptions {
+ freeCompilerArgs.addAll("-module-name", "co.touchlab.skie:configuration-annotations")
+ }
+}
+
+kotlin {
+ val jvmVersion = libs.versions.java.get().toInt()
+
+ jvmToolchain(jvmVersion)
+ targets.all {
+ mavenPublication {
+ attributes {
+ // TODO: Use `libs.versions.java`
+ attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, jvmVersion)
+ }
+ }
+ }
+
+ @targets@
+
+// jvm()
+// js {
+// browser()
+// nodejs()
+// }
+//
+// androidNativeArm32()
+// androidNativeArm64()
+// androidNativeX86()
+// androidNativeX64()
+//
+// // iosArm32()
+// iosArm64()
+// iosX64()
+// iosSimulatorArm64()
+//
+// watchosArm32()
+// watchosArm64()
+// // watchosX86()
+// watchosX64()
+// watchosSimulatorArm64()
+// watchosDeviceArm64()
+//
+// tvosArm64()
+// tvosX64()
+// tvosSimulatorArm64()
+//
+// macosX64()
+// macosArm64()
+//
+// linuxArm64()
+// // linuxArm32Hfp()
+// linuxX64()
+//
+// mingwX64()
+// // mingwX86()
+//
+// // wasm32()
+}
+
+// afterEvaluate {
+// println("Components:")
+// components.forEach {
+// println("\t${it.name}")
+// }
+// }
+
+// val p = project
+// project.launchInRequiredStage(KotlinPluginLifecycle.Stage.ReadyForExecution) {
+// println("Components: $p")
+// components.forEach { component ->
+// println("\t- ${component.name} - $component")
+// }
+//
+// println("Publications:")
+// publishing.publications.forEach { publication ->
+// println("\t- ${publication.name} - $publication")
+// }
+//
+// }
diff --git a/SKIE/common/configuration/annotations/impl/gradle.properties b/SKIE/common/configuration/annotations/impl/gradle.properties
new file mode 100644
index 000000000..2e019e7a2
--- /dev/null
+++ b/SKIE/common/configuration/annotations/impl/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=500m -XX:+UseParallelGC
diff --git a/SKIE/common/configuration/annotations/impl/settings.gradle.kts b/SKIE/common/configuration/annotations/impl/settings.gradle.kts
new file mode 100644
index 000000000..5baf5157d
--- /dev/null
+++ b/SKIE/common/configuration/annotations/impl/settings.gradle.kts
@@ -0,0 +1,22 @@
+rootProject.name = "configuration-annotations@artifactIdSuffix@"
+
+pluginManagement {
+ repositories {
+ gradlePluginPortal()
+ mavenCentral()
+ google()
+ }
+}
+
+dependencyResolutionManagement {
+ repositories {
+ mavenCentral()
+ google()
+ }
+
+ versionCatalogs {
+ create("libs") {
+ from(files("../../../../../gradle/libs.versions.toml"))
+ }
+ }
+}
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ClassInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ClassInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ClassInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ClassInterop.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/DefaultArgumentInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/DefaultArgumentInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/DefaultArgumentInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/DefaultArgumentInterop.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/EnumInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/EnumInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/EnumInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/EnumInterop.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ExperimentalFeatures.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ExperimentalFeatures.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ExperimentalFeatures.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/ExperimentalFeatures.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FlowInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FlowInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FlowInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FlowInterop.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FunctionInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FunctionInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FunctionInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/FunctionInterop.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SealedInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SealedInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SealedInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SealedInterop.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SkieVisibility.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SkieVisibility.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SkieVisibility.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SkieVisibility.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuppressSkieWarning.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuppressSkieWarning.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuppressSkieWarning.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuppressSkieWarning.kt
diff --git a/SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuspendInterop.kt b/SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuspendInterop.kt
similarity index 100%
rename from SKIE/common/configuration/annotations/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuspendInterop.kt
rename to SKIE/common/configuration/annotations/impl/src/commonMain/kotlin/co/touchlab/skie/configuration/annotations/SuspendInterop.kt
diff --git a/SKIE/kotlin-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/irbuilder/impl/namespace/BaseNamespace.kt b/SKIE/kotlin-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/irbuilder/impl/namespace/BaseNamespace.kt
index e413b3d94..c1cd253d3 100644
--- a/SKIE/kotlin-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/irbuilder/impl/namespace/BaseNamespace.kt
+++ b/SKIE/kotlin-compiler/linker-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/irbuilder/impl/namespace/BaseNamespace.kt
@@ -7,7 +7,9 @@ import co.touchlab.skie.phases.KotlinIrPhase
import co.touchlab.skie.phases.SymbolTablePhase
import co.touchlab.skie.phases.pluginContext
import co.touchlab.skie.phases.skieSymbolTable
+import org.jetbrains.kotlin.backend.common.extensions.FirIncompatiblePluginAPI
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.declarations.IrDeclarationContainer
import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext
@@ -44,6 +46,7 @@ abstract class BaseNamespace : Namespace {
}
context(KotlinIrPhase.Context)
+ @OptIn(ObsoleteDescriptorBasedAPI::class, FirIncompatiblePluginAPI::class)
override fun generateIrDeclarations() {
val generatorContext = GeneratorContext(
Psi2IrConfiguration(),
diff --git a/SKIE/publish.sh b/SKIE/publish.sh
new file mode 100644
index 000000000..655a6993c
--- /dev/null
+++ b/SKIE/publish.sh
@@ -0,0 +1,9 @@
+set -xe
+
+export RELEASE_VERSION=0.9.0
+
+./gradlew :initializeSonatypeStagingRepository
+
+./gradlew findSonatypeStagingRepository -x initializeSonatypeStagingRepository publishToSonatype
+
+./gradlew :findSonatypeStagingRepository -x initializeSonatypeStagingRepository :closeSonatypeStagingRepository
diff --git a/SKIE/runtime/kotlin/impl/build.gradle.kts b/SKIE/runtime/kotlin/impl/build.gradle.kts
new file mode 100644
index 000000000..acc120b63
--- /dev/null
+++ b/SKIE/runtime/kotlin/impl/build.gradle.kts
@@ -0,0 +1,110 @@
+import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
+
+plugins {
+ kotlin("multiplatform") version "@targetKotlinVersion@"
+ `maven-publish`
+ alias(libs.plugins.nexusPublish)
+}
+
+group = "co.touchlab.skie"
+version = System.getenv("RELEASE_VERSION").orEmpty().ifBlank { "1.0.0-SNAPSHOT" }
+
+nexusPublishing {
+ repositoryDescription = "$group:SKIE:$version"
+
+ this.repositories {
+ sonatype()
+ }
+}
+
+tasks.withType().configureEach {
+ isEnabled = false
+}
+
+@smokeTestTmpRepositoryConfiguration@
+
+val isRelease = !version.toString().endsWith("SNAPSHOT")
+val isPublishing = gradle.startParameter.taskNames.contains("publishToSonatype")
+val shouldSign = isRelease && isPublishing
+if (shouldSign) {
+ apply()
+ val signing = extensions.getByType()
+ val signingKey: String? by project
+ val signingPassword: String? by project
+ if (!signingKey.isNullOrBlank()) {
+ signing.useInMemoryPgpKeys(signingKey, signingPassword)
+ }
+ publishing.publications.withType().configureEach {
+ signing.sign(this)
+ }
+}
+
+publishing {
+ publications.withType().configureEach {
+ pom {
+ name = "SKIE Runtime - Kotlin"
+ description = "Kotlin Multiplatform part of the SKIE runtime. It's used to facilitate certain features of SKIE."
+ url = "https://skie.touchlab.co"
+
+ licenses {
+ license {
+ name = "The Apache License, Version 2.0"
+ url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ }
+ }
+
+ developers {
+ listOf(
+ "Kevin Galligan" to "kevin@touchlab.co",
+ "Filip Dolnik" to "filip@touchlab.co",
+ "Tadeas Kriz" to "tadeas@touchlab.co",
+ ).forEach { (name, email) ->
+ developer {
+ this.name = name
+ this.email = email
+ organization = "Touchlab"
+ organizationUrl = "https://touchlab.co"
+ }
+ }
+ }
+
+ scm {
+ connection = "scm:git:git://github.com/touchlab/SKIE.git"
+ developerConnection = "scm:git:ssh://github.com:touchlab/SKIE.git"
+ url = "https://github.com/touchlab/SKIE"
+ }
+ }
+
+ val publication = this
+ val javadocJar = tasks.register("${publication.name}JavadocJar") {
+ archiveClassifier.set("javadoc")
+ // Each archive name should be distinct. Mirror the format for the sources Jar tasks.
+ archiveBaseName.set("${archiveBaseName.orNull ?: project.name}-${publication.name}")
+ }
+ artifact(javadocJar)
+ }
+}
+
+kotlin {
+ @targets@
+
+ sourceSets.commonMain {
+ dependencies {
+ @dependencies@
+ }
+ }
+}
+
+tasks.withType().configureEach {
+ compilerOptions {
+ freeCompilerArgs.addAll("-module-name", "co.touchlab.skie:runtime-kotlin")
+ }
+}
+
+tasks.withType().configureEach {
+ compilerOptions {
+ freeCompilerArgs.addAll("-module-name", "co.touchlab.skie:runtime-kotlin")
+ }
+}
diff --git a/SKIE/runtime/kotlin/impl/gradle.properties b/SKIE/runtime/kotlin/impl/gradle.properties
new file mode 100644
index 000000000..2e019e7a2
--- /dev/null
+++ b/SKIE/runtime/kotlin/impl/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=500m -XX:+UseParallelGC
diff --git a/SKIE/runtime/kotlin/impl/settings.gradle.kts b/SKIE/runtime/kotlin/impl/settings.gradle.kts
new file mode 100644
index 000000000..c58cc3587
--- /dev/null
+++ b/SKIE/runtime/kotlin/impl/settings.gradle.kts
@@ -0,0 +1,22 @@
+rootProject.name = "runtime-kotlin@artifactIdSuffix@"
+
+pluginManagement {
+ repositories {
+ gradlePluginPortal()
+ mavenCentral()
+ google()
+ }
+}
+
+dependencyResolutionManagement {
+ repositories {
+ mavenCentral()
+ google()
+ }
+
+ versionCatalogs {
+ create("libs") {
+ from(files("../../../../gradle/libs.versions.toml"))
+ }
+ }
+}
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieColdFlowIterator.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieColdFlowIterator.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieColdFlowIterator.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieColdFlowIterator.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableSharedFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableSharedFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableSharedFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableSharedFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableStateFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableStateFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableStateFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinMutableStateFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableSharedFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableSharedFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableSharedFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableSharedFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableStateFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableStateFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableStateFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalMutableStateFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalSharedFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalSharedFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalSharedFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalSharedFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalStateFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalStateFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalStateFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinOptionalStateFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinSharedFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinSharedFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinSharedFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinSharedFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinStateFlow.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinStateFlow.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinStateFlow.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/flow/SkieKotlinStateFlow.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_CancellationHandler.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_CancellationHandler.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_CancellationHandler.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_CancellationHandler.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_DispatcherDelegate.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_DispatcherDelegate.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_DispatcherDelegate.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_DispatcherDelegate.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendHandler.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendHandler.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendHandler.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendHandler.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendResult.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendResult.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendResult.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/Skie_SuspendResult.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/CoroutineDispatcherWithDelegate.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/CoroutineDispatcherWithDelegate.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/CoroutineDispatcherWithDelegate.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/CoroutineDispatcherWithDelegate.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/NSLockWithLock.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/NSLockWithLock.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/NSLockWithLock.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/NSLockWithLock.kt
diff --git a/SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/ThrowableToNSError.kt b/SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/ThrowableToNSError.kt
similarity index 100%
rename from SKIE/runtime/kotlin/src/darwin/kgp_common/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/ThrowableToNSError.kt
rename to SKIE/runtime/kotlin/impl/src/commonMain/kotlin/co/touchlab/skie/runtime/coroutines/suspend/internal/ThrowableToNSError.kt
diff --git a/SKIE/runtime/kotlin/runtime-kotlin.gradle.backup.kts b/SKIE/runtime/kotlin/runtime-kotlin.gradle.backup.kts
new file mode 100644
index 000000000..978f157d7
--- /dev/null
+++ b/SKIE/runtime/kotlin/runtime-kotlin.gradle.backup.kts
@@ -0,0 +1,331 @@
+import co.touchlab.skie.gradle.KotlinCompilerVersion
+import co.touchlab.skie.gradle.KotlinToolingVersion
+import co.touchlab.skie.gradle.publish.mavenArtifactId
+import co.touchlab.skie.gradle.version.DarwinPlatformComponent
+import co.touchlab.skie.gradle.version.darwinPlatformDimension
+import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
+import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.tooling.GradleConnector
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSoftwareComponentWithCoordinatesAndPublication
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
+
+plugins {
+// id("skie.runtime.kotlin")
+ id("skie.publishable")
+// `maven-publish`
+ `java-base`
+}
+
+skiePublishing {
+ name = "SKIE Runtime - Kotlin"
+ description = "Kotlin Multiplatform part of the SKIE runtime. It's used to facilitate certain features of SKIE."
+ publishSources = true
+ publishJavadoc = true
+}
+
+
+// kotlin {
+// sourceSets.commonMain {
+// dependencies {
+// implementation(libs.kotlinx.coroutines.core.legacy)
+// }
+// }
+//
+// // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+// // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+// // This solution is far from ideal due to current project setup limitations - refactor this code as part of the build logic rewrite
+// sourceSets.configureEach {
+// val nameSegments = name.split("kgp_")
+// if (nameSegments.size == 2) {
+// val kgpVersionSegment = nameSegments[1]
+// dependencies {
+// if (kgpVersionSegment.startsWith("1.8.0")) {
+// implementation(libs.kotlinx.coroutines.core.legacy)
+// } else {
+// implementation(libs.kotlinx.coroutines.core)
+// }
+// }
+// }
+// }
+// }
+
+KotlinCompilerVersion.registerIn(dependencies, "2.0.0")
+
+abstract class BuildNestedGradle: DefaultTask() {
+
+ @get:InputDirectory
+ abstract val projectDir: DirectoryProperty
+
+ @get:Input
+ abstract val tasks: ListProperty
+
+ @get:Input
+ abstract val kotlinVersion: Property
+
+ @get:Input
+ abstract val archivePrefix: Property
+
+ init {
+// outputs.file(
+// zip(
+// kotlinVersion,
+// darwinPlatform,
+// projectDir,
+// archivePrefix,
+// ) { kotlinVersion, darwinPlatform, projectDir, arhivePrefix ->
+// projectDir.file("build/classes/kotlin/${darwinPlatform.value}/main/klib/${archivePrefix}__kgp_${kotlinVersion.replace('.', '_')}.klib")
+// }
+// )
+ }
+
+ fun zip(
+ aProperty: Property,
+ bProperty: Property,
+ cProperty: Property,
+ dProperty: Property,
+ combiner: (a: A, b: B, c: C, d: D) -> RESULT,
+ ): Provider {
+ return aProperty.zip(bProperty) { a, b -> a to b }
+ .zip(cProperty.zip(dProperty) { c, d -> c to d }) { (a, b), (c, d) ->
+ combiner(a, b, c, d)
+ }
+ }
+
+ @TaskAction
+ fun buildNestedGradle() {
+ val connection = GradleConnector.newConnector()
+ .forProjectDirectory(projectDir.get().asFile)
+ .connect()
+
+ connection.newBuild()
+ .forTasks(*tasks.get().toTypedArray())
+ .withSystemProperties(
+ mapOf(
+ "kotlinVersion" to kotlinVersion.get(),
+ )
+ )
+ .setStandardOutput(System.out)
+ .setStandardError(System.err)
+ .run()
+ }
+
+}
+
+abstract class SoftwareComponentFactoryAccessor @Inject constructor(
+ val softwareComponentFactory: SoftwareComponentFactory,
+)
+val softwareComponentFactoryAccessor = objects.newInstance()
+
+val rootSoftwareComponent = KotlinSoftwareComponentWithCoordinatesAndPublication(project, "kotlin", emptyList())
+components.create()
+
+val component = softwareComponentFactoryAccessor.softwareComponentFactory.adhoc("skieRuntime")
+components.add(component)
+
+val publication = publishing.publications.create("skieRuntime") {
+ artifactId = "runtime-kotlin"
+ from(component)
+
+ val sourcesJar = tasks.register("skieRuntimeSourcesJar") {
+ archiveClassifier = "sources"
+ }
+ artifact(sourcesJar)
+
+ val javadocJar = tasks.register("skieRuntimeJavadocJar") {
+ archiveClassifier = "javadoc"
+ }
+ artifact(javadocJar)
+}
+
+kotlinToolingVersionDimension().components.forEach { kotlinToolingVersion ->
+ val pathSafeKotlinVersionName = kotlinToolingVersion.primaryVersion.toString().replace('.', '_')
+ val supportedDarwinTargets = darwinPlatformDimension().components
+ .filter { it.sinceKotlinVersion?.let { kotlinToolingVersion.primaryVersion >= KotlinToolingVersion(it) } ?: true }
+ .filter { it.untilKotlinVersionExclusive?.let { kotlinToolingVersion.primaryVersion < KotlinToolingVersion(it) } ?: true }
+
+ val copyProjectTask = tasks.register("copyProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+ description = "Copies implementation for Kotlin ${kotlinToolingVersion.primaryVersion}."
+
+ from(layout.projectDirectory.dir("impl")) {
+ include("src/**", "build.gradle.kts", "gradle.properties", "settings.gradle.kts")
+ filter(
+ ReplaceTokens::class,
+ "tokens" to mapOf(
+ "targetKotlinVersion" to kotlinToolingVersion.primaryVersion.toString(),
+ "targets" to supportedDarwinTargets.joinToString("\n") { "$it()" },
+ // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+ // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+ "dependencies" to if (kotlinToolingVersion.value == "1.8.0") {
+ "implementation(libs.kotlinx.coroutines.core.legacy)"
+ } else {
+ "implementation(libs.kotlinx.coroutines.core)"
+ }
+ )
+ )
+ }
+ into(layout.buildDirectory.dir("impl_$pathSafeKotlinVersionName"))
+ }
+
+ val buildTask = tasks.register("buildProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+ group = "build"
+
+ dependsOn(copyProjectTask)
+
+ setDir(layout.buildDirectory.dir("impl_$pathSafeKotlinVersionName"))
+
+// archivePrefix = "runtime-kotlin"
+// projectDir =
+// kotlinVersion = kotlinToolingVersion.primaryVersion.toString()
+ tasks = supportedDarwinTargets.flatMap { darwinPlatformComponent ->
+ val uppercaseTargetName = darwinPlatformComponent.value.replaceFirstChar { it.uppercase() }
+ listOf(
+ "generateMetadataFileFor${uppercaseTargetName}Publication",
+ "generatePomFileFor${uppercaseTargetName}Publication",
+ )
+ } + listOf(
+ "generateMetadataFileForKotlinMultiplatformPublication",
+ "generatePomFileForKotlinMultiplatformPublication",
+ )
+ }
+
+
+// val buildTask = tasks.register("buildKotlin__kgp_${kotlinToolingVersion.primaryVersion}") {
+// group = "build"
+//
+// archivePrefix = "runtime-kotlin"
+// projectDir = layout.projectDirectory.dir("impl")
+// kotlinVersion = kotlinToolingVersion.primaryVersion.toString()
+// tasks = darwinPlatformDimension().components.flatMap { darwinPlatformComponent ->
+// val uppercaseTargetName = darwinPlatformComponent.value.replaceFirstChar { it.uppercase() }
+// listOf(
+// "generateMetadataFileFor${uppercaseTargetName}Publication",
+// "generatePomFileFor${uppercaseTargetName}Publication",
+// )
+// }
+// }
+
+ supportedDarwinTargets.map { darwinPlatformComponent ->
+ val configuration = configurations.create("${darwinPlatformComponent.value}__kgp_${kotlinToolingVersion.primaryVersion}") {
+ isCanBeConsumed = true
+ isCanBeResolved = false
+
+ attributes {
+ attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
+ attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class.java, Category.LIBRARY))
+ attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
+ attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named("non-jvm"))
+ attribute(KotlinNativeTarget.konanTargetAttribute, darwinPlatformComponent.kotlinNativeTarget)
+ attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.primaryVersion.toString()))
+ }
+ }
+
+ // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+ // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+ dependencies {
+ configuration(
+ if (kotlinToolingVersion.value == "1.8.0") {
+ libs.kotlinx.coroutines.core.legacy
+ } else {
+ libs.kotlinx.coroutines.core
+ }
+ )
+ }
+
+ val artifactName = "runtime-kotlin__kgp_${pathSafeKotlinVersionName}"
+ val artifactClassifierPrefix = "${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+ val klibPath = "impl_$pathSafeKotlinVersionName/build/classes/kotlin/${darwinPlatformComponent.value}/main/klib/skie-kotlin-runtime.klib"
+ val extraArchiveBaseName = "impl/build/libs/skie-kotlin-runtime__kgp_${pathSafeKotlinVersionName}-${darwinPlatformComponent.value.lowercase()}"
+
+ artifacts.add(configuration.name, layout.buildDirectory.file(klibPath)) {
+ builtBy(buildTask)
+ name = artifactName
+ classifier = artifactClassifierPrefix
+ }
+// if (kotlinToolingVersion.value == "1.8.0") {
+// val sourcesJar = tasks.register("${darwinPlatformComponent.value}__kgp_${pathSafeKotlinVersionName}SourcesJar") {
+// archiveClassifier = "$artifactClassifierPrefix-sources"
+// archiveBaseName = "${archiveBaseName.orNull ?: project.name}-${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// }
+// artifacts.add(configuration.name, sourcesJar.map { it.archiveFile }) {
+// builtBy(sourcesJar)
+// classifier = "$artifactClassifierPrefix-sources"
+// name = artifactName
+// }
+// } else {
+// artifacts.add(configuration.name, layout.projectDirectory.file("$extraArchiveBaseName-sources.jar")) {
+// builtBy(buildTask)
+// classifier = "$artifactClassifierPrefix-sources"
+// name = artifactName
+// }
+// }
+//
+// val javadocJar = tasks.register("${darwinPlatformComponent.value}__kgp_${pathSafeKotlinVersionName}JavadocJar") {
+// archiveClassifier = "$artifactClassifierPrefix-javadoc"
+// archiveBaseName = "${archiveBaseName.orNull ?: project.name}-${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// }
+// artifacts.add(configuration.name, javadocJar.map { it.archiveFile }) {
+// builtBy(javadocJar)
+// classifier = "$artifactClassifierPrefix-javadoc"
+// name = artifactName
+//
+// }
+//
+// artifacts.add(configuration.name, layout.projectDirectory.file("$extraArchiveBaseName-metadata.jar")) {
+// builtBy(buildTask)
+// classifier = "$artifactClassifierPrefix-metadata"
+// name = artifactName
+// }
+
+ component.addVariantsFromConfiguration(configuration) {
+ mapToMavenScope("runtime")
+ }
+ }
+}
+
+// val buildKotlinIosArm64__kgp_2_0_0 = tasks.register("buildKotlinIosArm64__kgp_2.0.0") {
+// setDir(layout.projectDirectory.dir("impl"))
+//
+// // TODO: Which task should we run?
+// /*
+// > Task :runtime:runtime-kotlin:compileKotlinIosArm32__kgp_1.9.0
+// > Task :runtime:runtime-kotlin:iosArm32__kgp_1.9.0SourcesJar
+// > Task :runtime:runtime-kotlin:generatePomFileForIosArm32__kgp_1.9.0Publication
+// */
+// tasks = listOf(
+// "iosArm64MainKlibrary",
+// )
+// }
+//
+// val iosArm64__kgp_2_0_0 = configurations.create("iosArm64__kgp_2.0.0") {
+// isCanBeConsumed = true
+// isCanBeResolved = false
+//
+// attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class.java, Category.LIBRARY))
+// attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
+// attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named("non-jvm"))
+// attribute(KotlinNativeTarget.konanTargetAttribute, "ios_arm64")
+// attribute(KotlinCompilerVersion.attribute, objects.named("2.0.0"))
+// }
+// }
+//
+// artifacts {
+// add("iosArm64__kgp_2.0.0", layout.projectDirectory.file("impl/build/classes/kotlin/iosArm64/main/klib/skie-kotlin-runtime__kgp_2_0_0.klib")) {
+// builtBy(buildKotlinIosArm64__kgp_2_0_0)
+// }
+// }
+
+// class RuntimeKotlinPlugin @Inject constructor(
+// private val softwareComponentFactory: SoftwareComponentFactory,
+// ): Plugin {
+// override fun apply(target: Project) {
+// val adhocComponent = softwareComponentFactory.adhoc("kotlin")
+//
+// components.add(adhocComponent)
+//
+// adhocComponent.addVariantsFromConfiguration()
+// }
+// }
diff --git a/SKIE/runtime/kotlin/runtime-kotlin.gradle.kts b/SKIE/runtime/kotlin/runtime-kotlin.gradle.kts
index bd37dfdb4..9876d0274 100644
--- a/SKIE/runtime/kotlin/runtime-kotlin.gradle.kts
+++ b/SKIE/runtime/kotlin/runtime-kotlin.gradle.kts
@@ -1,35 +1,875 @@
+@file:OptIn(ExternalKotlinTargetApi::class)
+
+import co.touchlab.skie.buildsetup.tasks.BuildNestedGradle
+import co.touchlab.skie.gradle.KotlinCompilerVersion
+import co.touchlab.skie.gradle.KotlinToolingVersion
+import co.touchlab.skie.gradle.version.darwinPlatformDimension
+import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
+import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.api.internal.component.SoftwareComponentInternal
+import org.gradle.api.publish.maven.internal.publication.MavenPublicationInternal
+import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSoftwareComponentWithCoordinatesAndPublication
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinCompilation.Delegate
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.ExternalKotlinCompilationDescriptor
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.ExternalKotlinTargetDescriptor
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.createCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.createExternalKotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf
+import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
+import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
+import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType
+import org.jetbrains.kotlin.gradle.targets.js.toAttribute
+import org.jetbrains.kotlin.gradle.utils.named
+import org.jetbrains.kotlin.konan.target.Architecture
+import org.jetbrains.kotlin.konan.target.Family
+import org.jetbrains.kotlin.konan.target.KonanTarget
+
plugins {
- id("skie.runtime.kotlin")
- id("skie.publishable")
+ id("skie.base")
+// kotlin("multiplatform")
+// id("skie.runtime.kotlin")
+// id("skie.publishable")
+// `maven-publish`
+// `java-base`
}
-skiePublishing {
- name = "SKIE Runtime - Kotlin"
- description = "Kotlin Multiplatform part of the SKIE runtime. It's used to facilitate certain features of SKIE."
- publishSources = true
+// skiePublishing {
+// name = "SKIE Runtime - Kotlin"
+// description = "Kotlin Multiplatform part of the SKIE runtime. It's used to facilitate certain features of SKIE."
+// publishSources = true
+// publishJavadoc = true
+// }
+
+// DOESN'T WORK FOR NATIVE ....
+// class IncludeBuildExternalTarget(delegate: Delegate): DecoratedExternalKotlinTarget(delegate) {
+//
+// }
+//
+// class IncludeBuildExternalCompilation(delegate: Delegate): DecoratedExternalKotlinCompilation(delegate) {
+//
+// }
+//
+// kotlin {
+// kotlinToolingVersionDimension().components.forEach { kotlinToolingVersion ->
+// val pathSafeKotlinVersionName = kotlinToolingVersion.primaryVersion.toString().replace('.', '_')
+// val supportedDarwinTargets = darwinPlatformDimension().components
+// .filter { it.sinceKotlinVersion?.let { kotlinToolingVersion.primaryVersion >= KotlinToolingVersion(it) } ?: true }
+// .filter { it.untilKotlinVersionExclusive?.let { kotlinToolingVersion.primaryVersion < KotlinToolingVersion(it) } ?: true }
+//
+// supportedDarwinTargets.forEach { darwinPlatformComponent ->
+// val target = createExternalKotlinTarget {
+// targetName = "${darwinPlatformComponent}__kgp_$pathSafeKotlinVersionName"
+// platformType = KotlinPlatformType.native
+// targetFactory = ExternalKotlinTargetDescriptor.TargetFactory(::IncludeBuildExternalTarget)
+//
+// configure { target ->
+// (target as KotlinTarget).attributes {
+// attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.value))
+// attribute(KotlinNativeTarget.konanTargetAttribute, darwinPlatformComponent.kotlinNativeTarget)
+// }
+// }
+// }
+//
+// val mainCompilation = target.createCompilation {
+// compilationName = KotlinCompilation.MAIN_COMPILATION_NAME
+// compilationFactory = ExternalKotlinCompilationDescriptor.CompilationFactory(::IncludeBuildExternalCompilation)
+// defaultSourceSet = sourceSets.maybeCreate(compilationName)
+// }
+// }
+// }
+// }
+
+// kotlin {
+// sourceSets.commonMain {
+// dependencies {
+// implementation(libs.kotlinx.coroutines.core.legacy)
+// }
+// }
+//
+// // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+// // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+// // This solution is far from ideal due to current project setup limitations - refactor this code as part of the build logic rewrite
+// sourceSets.configureEach {
+// val nameSegments = name.split("kgp_")
+// if (nameSegments.size == 2) {
+// val kgpVersionSegment = nameSegments[1]
+// dependencies {
+// if (kgpVersionSegment.startsWith("1.8.0")) {
+// implementation(libs.kotlinx.coroutines.core.legacy)
+// } else {
+// implementation(libs.kotlinx.coroutines.core)
+// }
+// }
+// }
+// }
+// }
+
+// KotlinCompilerVersion.registerIn(dependencies, "2.0.0")
+
+// abstract class BuildNestedGradle: DefaultTask() {
+//
+// @get:InputDirectory
+// abstract val projectDir: DirectoryProperty
+//
+// @get:Input
+// abstract val tasks: ListProperty
+//
+// @get:Input
+// abstract val kotlinVersion: Property
+//
+// @get:Input
+// abstract val archivePrefix: Property
+//
+// init {
+// // outputs.file(
+// // zip(
+// // kotlinVersion,
+// // darwinPlatform,
+// // projectDir,
+// // archivePrefix,
+// // ) { kotlinVersion, darwinPlatform, projectDir, arhivePrefix ->
+// // projectDir.file("build/classes/kotlin/${darwinPlatform.value}/main/klib/${archivePrefix}__kgp_${kotlinVersion.replace('.', '_')}.klib")
+// // }
+// // )
+// }
+//
+// fun zip(
+// aProperty: Property,
+// bProperty: Property,
+// cProperty: Property,
+// dProperty: Property,
+// combiner: (a: A, b: B, c: C, d: D) -> RESULT,
+// ): Provider {
+// return aProperty.zip(bProperty) { a, b -> a to b }
+// .zip(cProperty.zip(dProperty) { c, d -> c to d }) { (a, b), (c, d) ->
+// combiner(a, b, c, d)
+// }
+// }
+//
+// @TaskAction
+// fun buildNestedGradle() {
+// val connection = GradleConnector.newConnector()
+// .forProjectDirectory(projectDir.get().asFile)
+// .connect()
+//
+// connection.newBuild()
+// .forTasks(*tasks.get().toTypedArray())
+// .withSystemProperties(
+// mapOf(
+// "kotlinVersion" to kotlinVersion.get(),
+// )
+// )
+// .setStandardOutput(System.out)
+// .setStandardError(System.err)
+// .run()
+// }
+//
+// }
+
+// abstract class SoftwareComponentFactoryAccessor @Inject constructor(
+// val softwareComponentFactory: SoftwareComponentFactory,
+// )
+// val softwareComponentFactoryAccessor = objects.newInstance()
+//
+// // val rootSoftwareComponent = KotlinSoftwareComponentWithCoordinatesAndPublication(project, "kotlin", emptyList())
+// // components.create()
+//
+// val rootSourcesConfiguration = configurations.create("kotlinMultiplatformSourcesElements") {
+// attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_SOURCES))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+// attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+// attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES))
+// }
+// }
+//
+// val sourcesJar = tasks.register("skieRuntimeSourcesJar") {
+// archiveClassifier = "sources"
+// }
+//
+// artifacts.add(rootSourcesConfiguration.name, sourcesJar.map { it.archiveFile }) {
+// builtBy(sourcesJar)
+// }
+//
+// val rootSoftwareComponent = softwareComponentFactoryAccessor.softwareComponentFactory.adhoc("kotlin")
+// components.add(rootSoftwareComponent)
+// rootSoftwareComponent.addVariantsFromConfiguration(rootSourcesConfiguration) { }
+//
+// val rootPublication = publishing.publications.create("kotlinMultiplatform") {
+// from(rootSoftwareComponent)
+// (this as MavenPublicationInternal).publishWithOriginalFileName()
+// // artifactId = "runtime-kotlin"
+//
+//
+// // artifact(buildKotlinToolingMetadataTask.map { it.outputFile }) {
+// //
+// // }
+//
+// //
+//
+// //
+// // val javadocJar = tasks.register("skieRuntimeJavadocJar") {
+// // archiveClassifier = "javadoc"
+// // }
+// // artifact(javadocJar)
+// }
+
+
+
+// kotlinToolingVersionDimension().components.forEach { kotlinToolingVersion ->
+// val pathSafeKotlinVersionName = kotlinToolingVersion.primaryVersion.toString().replace('.', '_')
+// val supportedDarwinTargets = darwinPlatformDimension().components
+// .filter { it.sinceKotlinVersion?.let { kotlinToolingVersion.primaryVersion >= KotlinToolingVersion(it) } ?: true }
+// .filter { it.untilKotlinVersionExclusive?.let { kotlinToolingVersion.primaryVersion < KotlinToolingVersion(it) } ?: true }
+//
+// val copyProjectTask = tasks.register("copyProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+// description = "Copies implementation for Kotlin ${kotlinToolingVersion.primaryVersion}."
+//
+// from(layout.projectDirectory.dir("impl")) {
+// include("src/**", "build.gradle.kts", "gradle.properties", "settings.gradle.kts")
+// filter(
+// ReplaceTokens::class,
+// "tokens" to mapOf(
+// "targetKotlinVersion" to kotlinToolingVersion.primaryVersion.toString(),
+// "targets" to supportedDarwinTargets.joinToString("\n") { "$it()" },
+// // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+// // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+// "dependencies" to if (kotlinToolingVersion.value == "1.8.0") {
+// "implementation(libs.kotlinx.coroutines.core.legacy)"
+// } else {
+// "implementation(libs.kotlinx.coroutines.core)"
+// }
+// )
+// )
+// }
+// into(layout.buildDirectory.dir("impl_$pathSafeKotlinVersionName"))
+// }
+//
+// val buildTask = tasks.register("buildProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+// group = "build"
+//
+// dependsOn(copyProjectTask)
+//
+// setDir(layout.buildDirectory.dir("impl_$pathSafeKotlinVersionName"))
+//
+// // archivePrefix = "runtime-kotlin"
+// // projectDir =
+// // kotlinVersion = kotlinToolingVersion.primaryVersion.toString()
+// tasks = supportedDarwinTargets.flatMap { darwinPlatformComponent ->
+// val uppercaseTargetName = darwinPlatformComponent.value.replaceFirstChar { it.uppercase() }
+// listOf(
+// "generateMetadataFileFor${uppercaseTargetName}Publication",
+// "generatePomFileFor${uppercaseTargetName}Publication",
+// )
+// } + listOf(
+// "generateMetadataFileForKotlinMultiplatformPublication",
+// "generatePomFileForKotlinMultiplatformPublication",
+// )
+// }
+//
+// // val component = softwareComponentFactoryAccessor.softwareComponentFactory.adhoc("skieRuntime")
+// // components.add(component)
+//
+//
+// // val buildTask = tasks.register("buildKotlin__kgp_${kotlinToolingVersion.primaryVersion}") {
+// // group = "build"
+// //
+// // archivePrefix = "runtime-kotlin"
+// // projectDir = layout.projectDirectory.dir("impl")
+// // kotlinVersion = kotlinToolingVersion.primaryVersion.toString()
+// // tasks = darwinPlatformDimension().components.flatMap { darwinPlatformComponent ->
+// // val uppercaseTargetName = darwinPlatformComponent.value.replaceFirstChar { it.uppercase() }
+// // listOf(
+// // "generateMetadataFileFor${uppercaseTargetName}Publication",
+// // "generatePomFileFor${uppercaseTargetName}Publication",
+// // )
+// // }
+// // }
+//
+// supportedDarwinTargets.map { darwinPlatformComponent ->
+// val componentName = "${darwinPlatformComponent.value}__kgp_${kotlinToolingVersion.primaryVersion}"
+//
+// // val configuration = configurations.create(componentName) {
+// // isCanBeConsumed = true
+// // isCanBeResolved = false
+// //
+// // attributes {
+// // attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
+// // attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class.java, Category.LIBRARY))
+// // attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
+// // attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named("non-jvm"))
+// // attribute(KotlinNativeTarget.konanTargetAttribute, darwinPlatformComponent.kotlinNativeTarget)
+// // attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.primaryVersion.toString()))
+// // }
+// // }
+//
+// // val component = softwareComponentFactoryAccessor.softwareComponentFactory.adhoc(componentName)
+// // component.addVariantsFromConfiguration()
+//
+// // val componentPublication = publishing.publications.create(componentName).apply {
+// // from(component)
+// // (this as MavenPublicationInternal).publishWithOriginalFileName()
+// // artifactId = componentName
+// //
+// // // TODO: Rewrite poms?
+// // }
+//
+// // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+// // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+// // dependencies {
+// // configuration(
+// // if (kotlinToolingVersion.value == "1.8.0") {
+// // libs.kotlinx.coroutines.core.legacy
+// // } else {
+// // libs.kotlinx.coroutines.core
+// // }
+// // )
+// // }
+//
+// val artifactName = "runtime-kotlin__kgp_${pathSafeKotlinVersionName}"
+// val artifactClassifierPrefix = "${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// val klibPath = "impl_$pathSafeKotlinVersionName/build/classes/kotlin/${darwinPlatformComponent.value}/main/klib/skie-kotlin-runtime.klib"
+// val extraArchiveBaseName = "impl/build/libs/skie-kotlin-runtime__kgp_${pathSafeKotlinVersionName}-${darwinPlatformComponent.value.lowercase()}"
+//
+// artifacts.add(configuration.name, layout.buildDirectory.file(klibPath)) {
+// builtBy(buildTask)
+// name = artifactName
+// classifier = artifactClassifierPrefix
+// }
+// // if (kotlinToolingVersion.value == "1.8.0") {
+// // val sourcesJar = tasks.register("${darwinPlatformComponent.value}__kgp_${pathSafeKotlinVersionName}SourcesJar") {
+// // archiveClassifier = "$artifactClassifierPrefix-sources"
+// // archiveBaseName = "${archiveBaseName.orNull ?: project.name}-${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// // }
+// // artifacts.add(configuration.name, sourcesJar.map { it.archiveFile }) {
+// // builtBy(sourcesJar)
+// // classifier = "$artifactClassifierPrefix-sources"
+// // name = artifactName
+// // }
+// // } else {
+// // artifacts.add(configuration.name, layout.projectDirectory.file("$extraArchiveBaseName-sources.jar")) {
+// // builtBy(buildTask)
+// // classifier = "$artifactClassifierPrefix-sources"
+// // name = artifactName
+// // }
+// // }
+// //
+// // val javadocJar = tasks.register("${darwinPlatformComponent.value}__kgp_${pathSafeKotlinVersionName}JavadocJar") {
+// // archiveClassifier = "$artifactClassifierPrefix-javadoc"
+// // archiveBaseName = "${archiveBaseName.orNull ?: project.name}-${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// // }
+// // artifacts.add(configuration.name, javadocJar.map { it.archiveFile }) {
+// // builtBy(javadocJar)
+// // classifier = "$artifactClassifierPrefix-javadoc"
+// // name = artifactName
+// //
+// // }
+// //
+// // artifacts.add(configuration.name, layout.projectDirectory.file("$extraArchiveBaseName-metadata.jar")) {
+// // builtBy(buildTask)
+// // classifier = "$artifactClassifierPrefix-metadata"
+// // name = artifactName
+// // }
+//
+// component.addVariantsFromConfiguration(configuration) {
+// mapToMavenScope("runtime")
+// }
+//
+// val platformModuleDependencyProvider = provider {
+// (project.dependencies.create("co.touchlab.skie:${componentName}:${version}") as ModuleDependency).apply {
+// capabilities {
+// requireCapability(
+// ComputedCapability(
+// groupProvider = provider { group.toString() },
+// nameValue = componentName,
+// versionProvider = provider { version.toString() },
+// suffix = "",
+// )
+// )
+// }
+// }
+// }
+//
+// val publishedConfiguration = configurations.create("${configuration.name}-published") {
+// isCanBeConsumed = false
+// isCanBeResolved = false
+//
+// configuration.outgoing.capability(
+// ComputedCapability(
+// groupProvider = provider { group.toString() },
+// nameValue = componentName,
+// versionProvider = provider { version.toString() },
+// suffix = "",
+// )
+// )
+// dependencies.addLater(platformModuleDependencyProvider)
+// copyAttributes(configuration.attributes, this.attributes)
+// rootSoftwareComponent.addVariantsFromConfiguration(this) { }
+// }
+// }
+// }
+
+// private class ComputedCapability(
+// val groupProvider: Provider,
+// val nameValue: String,
+// val versionProvider: Provider,
+// val suffix: String?
+// ) : Capability {
+// override fun getGroup(): String = groupProvider.get()
+//
+// override fun getName(): String = nameValue + suffix?.let { "..$it" }.orEmpty()
+//
+// override fun getVersion(): String? = versionProvider.get()
+//
+// fun notation(): String = "$group:$name:$version"
+// }
+//
+// private fun copyAttributes(from: AttributeContainer, to: AttributeContainer, keys: Iterable> = from.keySet()) {
+// // capture type argument T
+// fun copyOneAttribute(from: AttributeContainer, to: AttributeContainer, key: Attribute) {
+// val value = checkNotNull(from.getAttribute(key))
+// to.attribute(key, value)
+// }
+// for (key in keys) {
+// copyOneAttribute(from, to, key)
+// }
+// }
+
+// val buildKotlinIosArm64__kgp_2_0_0 = tasks.register("buildKotlinIosArm64__kgp_2.0.0") {
+// setDir(layout.projectDirectory.dir("impl"))
+//
+// // TODO: Which task should we run?
+// /*
+// > Task :runtime:runtime-kotlin:compileKotlinIosArm32__kgp_1.9.0
+// > Task :runtime:runtime-kotlin:iosArm32__kgp_1.9.0SourcesJar
+// > Task :runtime:runtime-kotlin:generatePomFileForIosArm32__kgp_1.9.0Publication
+// */
+// tasks = listOf(
+// "iosArm64MainKlibrary",
+// )
+// }
+
+// val iosArm64__kgp_2_0_0 = configurations.create("iosArm64__kgp_2.0.0") {
+// isCanBeConsumed = true
+// isCanBeResolved = false
+//
+// attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class.java, Category.LIBRARY))
+// attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
+// attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named("non-jvm"))
+// attribute(KotlinNativeTarget.konanTargetAttribute, "ios_arm64")
+// attribute(KotlinCompilerVersion.attribute, objects.named("2.0.0"))
+// }
+// }
+
+// artifacts {
+// add("iosArm64__kgp_2.0.0", layout.projectDirectory.file("impl/build/classes/kotlin/iosArm64/main/klib/skie-kotlin-runtime__kgp_2_0_0.klib")) {
+// builtBy(buildKotlinIosArm64__kgp_2_0_0)
+// }
+// }
+
+// class RuntimeKotlinPlugin @Inject constructor(
+// private val softwareComponentFactory: SoftwareComponentFactory,
+// ): Plugin {
+// override fun apply(target: Project) {
+// val adhocComponent = softwareComponentFactory.adhoc("kotlin")
+//
+// components.add(adhocComponent)
+//
+// adhocComponent.addVariantsFromConfiguration()
+// }
+// }
+
+
+
+// private fun createRootPublication(project: Project, publishing: PublishingExtension): MavenPublication {
+// // val rootSoftwareComponent =
+//
+// return publishing.publications.create("kotlinMultiplatform") {
+// from(rootSoftwareComponent)
+// (this as MavenPublicationInternal).publishWithOriginalFileName()
+//
+// }
+// }
+
+// private fun MavenPublication.addKotlinToolingMetadataArtifactIfNeeded(
+// project: Project,
+// buildKotlinToolingMetadataTask: Task,
+// artifactFile: Provider,
+// ) {
+// artifact() {
+//
+// }
+// }
+
+// private fun List.createTargetPublications(project: Project, publishing: PublishingExtension) {
+// this.forEach { kotlinTarget ->
+//
+// }
+// }
+//
+// private fun SkieRuntimeTarget.createMavenPublications(publications: PublicationContainer) {
+//
+// }
+//
+// private fun SkieRuntimeTarget.setupApiElements(configuration: Configuration) {
+// configuration.setUsesPlatformOf(this)
+// configuration.attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.producerApiUsage(project, platformType))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+// }
+// }
+//
+// private fun SkieRuntimeTarget.setupRuntimeElements(configuration: Configuration) {
+// configuration.setUsesPlatformOf(this)
+// configuration.attributes {
+// attribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.producerRuntimeUsage(project, platformType))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+// }
+// }
+//
+// private fun SkieRuntimeTarget.setupSourcesElements(configuration: Configuration) {
+// configuration.configureSourcesPublicationAttributes(this)
+// }
+//
+// private fun Configuration.configureSourcesPublicationAttributes(target: SkieRuntimeTarget) {
+// attributes {
+// // In order to be consistent with Java Gradle Plugin, set usage attribute for sources variant
+// // to be either JAVA_RUNTIME (for jvm) or KOTLIN_RUNTIME (for other targets)
+// // the latter isn't a strong requirement since there is no tooling that consume kotlin sources through gradle variants at the moment
+// // so consistency with Java Gradle Plugin seemed most desirable choice.
+// attribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.producerRuntimeUsage(project, target.platformType))
+// attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+// attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES))
+// // Bundling attribute is about component dependencies, external means that they are provided as separate components
+// // source variants doesn't have any dependencies (at least at the moment) so there is not much sense to use this attribute
+// // however for Java Gradle Plugin compatibility and in order to prevent weird Variant Resolution errors we include this attribute
+// attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+// }
+// setUsesPlatformOf(target)
+// }
+//
+// object KotlinUsages {
+// const val KOTLIN_API = "kotlin-api"
+// const val KOTLIN_RUNTIME = "kotlin-runtime"
+// const val KOTLIN_METADATA = "kotlin-metadata"
+// const val KOTLIN_SOURCES = "kotlin-sources"
+//
+// private val jvmPlatformTypes: Set = setOf(KotlinPlatformType.jvm, KotlinPlatformType.androidJvm)
+//
+// internal fun producerApiUsage(project: Project, platformType: KotlinPlatformType) = project.objects.named(Usage::class.java,
+// when (platformType) {
+// in jvmPlatformTypes -> "java-api-jars"
+// else -> org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages.KOTLIN_API
+// }
+// )
+//
+// internal fun producerRuntimeUsage(project: Project, platformType: KotlinPlatformType) = project.objects.named(Usage::class.java,
+// when (platformType) {
+// // This attribute is deprecated in Gradle and additionally to Usage attribute
+// // it implicitly adds `org.gradle.libraryelements=jar`
+// in jvmPlatformTypes -> "java-runtime-jars"
+// else -> org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages.KOTLIN_RUNTIME
+// }
+// )
+// }
+//
+// fun T.setUsesPlatformOf(target: SkieRuntimeTarget): T {
+// attributes.attribute(KotlinPlatformType.attribute, target.platformType)
+//
+// attributes.attribute(
+// TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+// project.objects.named(
+// when (target.platformType) {
+// KotlinPlatformType.jvm -> "standard-jvm"
+// KotlinPlatformType.androidJvm -> "android"
+// else -> "non-jvm"
+// }
+// )
+// )
+//
+// when (target) {
+// is SkieRuntimeJsTarget -> {
+// attributes.attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.legacy)
+// }
+// is SkieRuntimeJsIrTarget -> if (target.platformType == KotlinPlatformType.js) {
+// attributes.attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir)
+// } else {
+// attributes.attribute(KotlinWasmTargetAttribute.wasmTargetAttribute, target.wasmTargetType!!.toAttribute())
+// }
+// is SkieRuntimeNativeTarget -> {
+// attributes.attribute(KotlinNativeTarget.konanTargetAttribute, target.konanTarget.name)
+// }
+// else -> {}
+// }
+//
+// return this
+// }
+//
+// sealed interface SkieRuntimeTarget {
+// val platformType: KotlinPlatformType
+// }
+//
+// interface SkieRuntimeJsTarget: SkieRuntimeTarget
+//
+// interface SkieRuntimeJsIrTarget: SkieRuntimeTarget {
+// val wasmTargetType: KotlinWasmTargetType?
+// }
+//
+// class SkieRuntimeNativeTarget(
+// val konanTarget: SkieRuntimeKonanTarget
+// ): SkieRuntimeTarget {
+// override val platformType: KotlinPlatformType = KotlinPlatformType.native
+// }
+//
+// sealed class SkieRuntimeKonanTarget(
+// val name: String,
+// val sinceKotlinVersion: String? = null,
+// val untilKotlinVersionExclusive: String? = null
+// ) {
+// object ANDROID_X64: SkieRuntimeKonanTarget("android_x64")
+// object ANDROID_X86: SkieRuntimeKonanTarget("android_x86")
+// object ANDROID_ARM32: SkieRuntimeKonanTarget("android_arm32")
+// object ANDROID_ARM64: SkieRuntimeKonanTarget("android_arm64")
+// object IOS_ARM32: SkieRuntimeKonanTarget("ios_arm32", untilKotlinVersionExclusive = "2.0.0")
+// object IOS_ARM64: SkieRuntimeKonanTarget("ios_arm64")
+// object IOS_X64: SkieRuntimeKonanTarget("ios_x64")
+// object IOS_SIMULATOR_ARM64: SkieRuntimeKonanTarget("ios_simulator_arm64")
+// object WATCHOS_ARM32: SkieRuntimeKonanTarget("watchos_arm32")
+// object WATCHOS_ARM64: SkieRuntimeKonanTarget("watchos_arm64")
+// object WATCHOS_X86: SkieRuntimeKonanTarget("watchos_x86", untilKotlinVersionExclusive = "2.0.0")
+// object WATCHOS_X64: SkieRuntimeKonanTarget("watchos_x64")
+// object WATCHOS_SIMULATOR_ARM64: SkieRuntimeKonanTarget("watchos_simulator_arm64")
+// object WATCHOS_DEVICE_ARM64: SkieRuntimeKonanTarget("watchos_device_arm64", sinceKotlinVersion = "1.8.20")
+// object TVOS_ARM64: SkieRuntimeKonanTarget("tvos_arm64")
+// object TVOS_X64: SkieRuntimeKonanTarget("tvos_x64")
+// object TVOS_SIMULATOR_ARM64: SkieRuntimeKonanTarget("tvos_simulator_arm64")
+// object MACOS_X64: SkieRuntimeKonanTarget("macos_x64")
+// object MACOS_ARM64: SkieRuntimeKonanTarget("macos_arm64")
+// object LINUX_X64: SkieRuntimeKonanTarget("linux_x64")
+// object MINGW_X86: SkieRuntimeKonanTarget("mingw_x86", untilKotlinVersionExclusive = "2.0.0")
+// object MINGW_X64: SkieRuntimeKonanTarget("mingw_x64")
+// object LINUX_ARM64: SkieRuntimeKonanTarget("linux_arm64")
+// object LINUX_ARM32_HFP: SkieRuntimeKonanTarget("linux_arm32_hfp")
+// object LINUX_MIPS32: SkieRuntimeKonanTarget("linux_mips32", untilKotlinVersionExclusive = "2.0.0")
+// object LINUX_MIPSEL32: SkieRuntimeKonanTarget("linux_mipsel32", untilKotlinVersionExclusive = "2.0.0")
+// object WASM32: SkieRuntimeKonanTarget("wasm32", untilKotlinVersionExclusive = "2.0.0")
+// object ZEPHYR: SkieRuntimeKonanTarget("zephyr", untilKotlinVersionExclusive = "2.0.0")
+// }
+//
+// val skieRuntimeDarwinTargets = listOf(
+// SkieRuntimeKonanTarget.IOS_ARM32,
+// SkieRuntimeKonanTarget.IOS_ARM64,
+// SkieRuntimeKonanTarget.IOS_X64,
+// SkieRuntimeKonanTarget.IOS_SIMULATOR_ARM64,
+// SkieRuntimeKonanTarget.WATCHOS_ARM32,
+// SkieRuntimeKonanTarget.WATCHOS_ARM64,
+// SkieRuntimeKonanTarget.WATCHOS_X86,
+// SkieRuntimeKonanTarget.WATCHOS_X64,
+// SkieRuntimeKonanTarget.WATCHOS_SIMULATOR_ARM64,
+// SkieRuntimeKonanTarget.WATCHOS_DEVICE_ARM64,
+// SkieRuntimeKonanTarget.TVOS_ARM64,
+// SkieRuntimeKonanTarget.TVOS_X64,
+// SkieRuntimeKonanTarget.TVOS_SIMULATOR_ARM64,
+// SkieRuntimeKonanTarget.MACOS_X64,
+// SkieRuntimeKonanTarget.MACOS_ARM64,
+// ).map(::SkieRuntimeNativeTarget)
+//
+//
+// class SkieRuntimeSoftwareComponentWithCoordinatesAndPublication(
+//
+// )
+//
+// abstract class SkieRuntimeSoftwareComponent(
+// private val project: Project,
+// private val name: String,
+// protected val skieRuntimeTargets: Iterable,
+// ): SoftwareComponentInternal, ComponentWithVariants {
+//
+// override fun getName(): String = name
+//
+// override fun getVariants(): MutableSet {
+//
+// }
+//
+// }
+
+val smokeTestTmpRepositoryPath: String? by project
+val publishTaskNames = listOfNotNull(
+ "publishToMavenLocal" to listOf("publishToMavenLocal"),
+ "publishToSonatype" to listOf("findSonatypeStagingRepository", "publishToSonatype"),
+ if (smokeTestTmpRepositoryPath != null) {
+ "publishAllPublicationsToSmokeTestTmpRepository" to listOf("publishAllPublicationsToSmokeTestTmpRepository")
+ } else {
+ null
+ },
+)
+
+val publishTaskNamesWithTasks = publishTaskNames.associateWith { (publishTaskName, _) ->
+ tasks.register(publishTaskName)
}
-kotlin {
- sourceSets.commonMain {
- dependencies {
- implementation(libs.kotlinx.coroutines.core.legacy)
+val kotlin_1_8_0 = KotlinToolingVersion("1.8.0")
+
+kotlinToolingVersionDimension().components.forEach { kotlinToolingVersion ->
+ val pathSafeKotlinVersionName = kotlinToolingVersion.primaryVersion.toString().replace('.', '_')
+ val supportedDarwinTargets = darwinPlatformDimension().components
+ .filter { it.sinceKotlinVersion?.let { kotlinToolingVersion.primaryVersion >= KotlinToolingVersion(it) } ?: true }
+ .filter { it.untilKotlinVersionExclusive?.let { kotlinToolingVersion.primaryVersion < KotlinToolingVersion(it) } ?: true }
+
+ val copyProjectTask = tasks.register("copyProject__kgp_${kotlinToolingVersion.primaryVersion}") {
+ description = "Copies implementation for Kotlin ${kotlinToolingVersion.primaryVersion}."
+
+ from(layout.projectDirectory.dir("impl")) {
+ include("src/**", "build.gradle.kts", "gradle.properties", "settings.gradle.kts")
+ filter(
+ ReplaceTokens::class,
+ "tokens" to mapOf(
+ "targetKotlinVersion" to kotlinToolingVersion.primaryVersion.toString(),
+ "artifactIdSuffix" to "-${kotlinToolingVersion.primaryVersion}",
+ "targets" to supportedDarwinTargets.joinToString("\n") { "$it()" },
+ // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
+ // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
+ "dependencies" to if (kotlinToolingVersion.primaryVersion == kotlin_1_8_0) {
+ "implementation(libs.kotlinx.coroutines.core.legacy)"
+ } else {
+ "implementation(libs.kotlinx.coroutines.core)"
+ },
+ "artifactIdSuffix" to "-${kotlinToolingVersion.primaryVersion}",
+ "smokeTestTmpRepositoryConfiguration" to smokeTestTmpRepositoryPath?.let {
+ """
+ publishing {
+ repositories {
+ maven {
+ url = uri("$it")
+ name = "smokeTestTmp"
+ }
+ }
+ }
+ """.trimIndent()
+ }.orEmpty(),
+ )
+ )
}
+ into(layout.buildDirectory.dir("impl_${pathSafeKotlinVersionName}"))
+ }
+
+ val buildTask = tasks.register("buildProject__kgp_${pathSafeKotlinVersionName}") {
+ group = "build"
+
+ dependsOn(copyProjectTask)
+
+ setDir(layout.buildDirectory.dir("impl_${pathSafeKotlinVersionName}"))
+
+// archivePrefix = "runtime-kotlin"
+// projectDir =
+// kotlinVersion = kotlinToolingVersion.primaryVersion.toString()
+ tasks = supportedDarwinTargets.flatMap { darwinPlatformComponent ->
+ val uppercaseTargetName = darwinPlatformComponent.value.replaceFirstChar { it.uppercase() }
+ listOf(
+ "generateMetadataFileFor${uppercaseTargetName}Publication",
+ "generatePomFileFor${uppercaseTargetName}Publication",
+ )
+ } + listOf(
+ "generateMetadataFileForKotlinMultiplatformPublication",
+ "generatePomFileForKotlinMultiplatformPublication",
+ )
}
- // Runtime requires Coroutines but watchosDeviceArm64 is only supported since Coroutines 1.7.0 which require Kotlin 1.8.20
- // For this reason we must use an older version of Coroutines for Kotlin 1.8.0
- // This solution is far from ideal due to current project setup limitations - refactor this code as part of the build logic rewrite
- sourceSets.configureEach {
- val nameSegments = name.split("kgp_")
- if (nameSegments.size == 2) {
- val kgpVersionSegment = nameSegments[1]
- dependencies {
- if (kgpVersionSegment.startsWith("1.8.0")) {
- implementation(libs.kotlinx.coroutines.core.legacy)
- } else {
- implementation(libs.kotlinx.coroutines.core)
- }
+ publishTaskNamesWithTasks.forEach { (publishTaskNames, parentPublishTask) ->
+ val (publishTaskName, publishTasks) = publishTaskNames
+ val publishTask = tasks.register("${publishTaskName}__kgp_${kotlinToolingVersion.primaryVersion}") {
+ group = "publishing"
+
+ dependsOn(copyProjectTask)
+
+ projectDir.fileProvider(copyProjectTask.map { it.destinationDir })
+
+ tasks.set(publishTasks)
+ }
+
+ parentPublishTask.configure {
+ dependsOn(publishTask)
+ }
+ }
+
+ supportedDarwinTargets.forEach { darwinPlatformComponent ->
+ val configuration = configurations.create("${darwinPlatformComponent.value}__kgp_${kotlinToolingVersion.primaryVersion}") {
+ isCanBeConsumed = true
+ isCanBeResolved = false
+
+ attributes {
+ attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinUsages.KOTLIN_API))
+ attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class.java, Category.LIBRARY))
+ attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
+ attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named("non-jvm"))
+ attribute(KotlinNativeTarget.konanTargetAttribute, darwinPlatformComponent.kotlinNativeTarget)
+ attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.primaryVersion.toString()))
}
}
+
+ dependencies {
+ configuration(
+ libs.kotlinx.coroutines.core
+ )
+ }
+
+ val artifactName = "runtime-kotlin__kgp_2_0_0"
+ val artifactClassifierPrefix = "${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+ val klibPath = "impl_${pathSafeKotlinVersionName}/build/classes/kotlin/${darwinPlatformComponent.value}/main/klib/skie-runtime-kotlin.klib"
+ val extraArchiveBaseName = "impl/build/libs/skie-runtime-kotlin__kgp_${pathSafeKotlinVersionName}-${darwinPlatformComponent.value.lowercase()}"
+
+ artifacts.add(configuration.name, layout.buildDirectory.file(klibPath)) {
+ builtBy(buildTask)
+ name = artifactName
+ classifier = artifactClassifierPrefix
+ }
+// if (kotlinToolingVersion.value == "1.8.0") {
+// val sourcesJar = tasks.register("${darwinPlatformComponent.value}__kgp_${pathSafeKotlinVersionName}SourcesJar") {
+// archiveClassifier = "$artifactClassifierPrefix-sources"
+// archiveBaseName = "${archiveBaseName.orNull ?: project.name}-${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// }
+// artifacts.add(configuration.name, sourcesJar.map { it.archiveFile }) {
+// builtBy(sourcesJar)
+// classifier = "$artifactClassifierPrefix-sources"
+// name = artifactName
+// }
+// } else {
+// artifacts.add(configuration.name, layout.projectDirectory.file("$extraArchiveBaseName-sources.jar")) {
+// builtBy(buildTask)
+// classifier = "$artifactClassifierPrefix-sources"
+// name = artifactName
+// }
+// }
+//
+// val javadocJar = tasks.register("${darwinPlatformComponent.value}__kgp_${pathSafeKotlinVersionName}JavadocJar") {
+// archiveClassifier = "$artifactClassifierPrefix-javadoc"
+// archiveBaseName = "${archiveBaseName.orNull ?: project.name}-${darwinPlatformComponent.value}-kgp_${pathSafeKotlinVersionName}"
+// }
+// artifacts.add(configuration.name, javadocJar.map { it.archiveFile }) {
+// builtBy(javadocJar)
+// classifier = "$artifactClassifierPrefix-javadoc"
+// name = artifactName
+//
+// }
+//
+// artifacts.add(configuration.name, layout.projectDirectory.file("$extraArchiveBaseName-metadata.jar")) {
+// builtBy(buildTask)
+// classifier = "$artifactClassifierPrefix-metadata"
+// name = artifactName
+// }
+//
+// component.addVariantsFromConfiguration(configuration) {
+// mapToMavenScope("runtime")
+// }
}
}
diff --git a/SKIE/settings.gradle.kts b/SKIE/settings.gradle.kts
index 3389df2a5..9fa794b81 100644
--- a/SKIE/settings.gradle.kts
+++ b/SKIE/settings.gradle.kts
@@ -68,5 +68,10 @@ buildSetup {
val `regular-dependency` by module("regular")
val `exported-dependency` by module("exported")
}
+
+ val functional by module()
+ val libraries by module()
+ val stdlib by module()
+ val `type-mapping` by module()
}
}
diff --git a/SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts b/SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts
index f47d73004..00bdadef4 100644
--- a/SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts
+++ b/SKIE/skie-gradle/plugin-api/gradle-plugin-api.gradle.kts
@@ -9,12 +9,10 @@ skiePublishing {
}
kotlin {
- sourceSets {
- val commonMain by getting {
- dependencies {
- api(projects.common.configuration.configurationDeclaration)
- implementation(projects.common.configuration.configurationInternal)
- }
+ sourceSets.commonMain {
+ dependencies {
+ api(projects.common.configuration.configurationDeclaration)
+ implementation(projects.common.configuration.configurationInternal)
}
}
}
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieAnalyticsConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieBuildConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieDebugConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieExtension.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieFeatureConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieSwiftBundlingConfiguration.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieSwiftBundlingConfiguration.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieSwiftBundlingConfiguration.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieSwiftBundlingConfiguration.kt
diff --git a/SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/util/BooleanProperty.takeIf.kt b/SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/util/BooleanProperty.takeIf.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-api/src/common/kotlin/co/touchlab/skie/plugin/util/BooleanProperty.takeIf.kt
rename to SKIE/skie-gradle/plugin-api/src/main/kotlin/co/touchlab/skie/plugin/util/BooleanProperty.takeIf.kt
diff --git a/SKIE/skie-gradle/plugin-impl/gradle-plugin-impl.gradle.kts b/SKIE/skie-gradle/plugin-impl/gradle-plugin-impl.gradle.kts
index 8f9555c15..35fe5c514 100644
--- a/SKIE/skie-gradle/plugin-impl/gradle-plugin-impl.gradle.kts
+++ b/SKIE/skie-gradle/plugin-impl/gradle-plugin-impl.gradle.kts
@@ -11,6 +11,7 @@ import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
plugins {
id("skie.gradle")
+ // TODO: Remove
id("skie.publishable")
id("dev.buildconfig")
@@ -22,81 +23,85 @@ skiePublishing {
}
kotlin {
- sourceSets {
- val commonMain by getting {
- dependencies {
- api(projects.gradle.gradlePluginApi)
- api(projects.gradle.gradlePluginShimApi)
- implementation(projects.common.configuration.configurationDeclaration)
- implementation(projects.gradle.gradleSubPluginApi)
- implementation(projects.gradle.gradlePluginUtil)
- implementation(projects.common.analytics)
- implementation(projects.common.util)
-
- implementation(libs.ci.info)
- implementation(libs.jgit)
- implementation(libs.mixpanel)
- }
-
- kotlin.srcDirs(
- layout.projectDirectory.dir("src/common/kotlin-compiler-attribute"),
- )
+ sourceSets.commonMain {
+ dependencies {
+ api(projects.gradle.gradlePluginApi)
+ api(projects.gradle.gradlePluginShimApi)
+ implementation(projects.common.configuration.configurationDeclaration)
+ implementation(projects.gradle.gradleSubPluginApi)
+ implementation(projects.gradle.gradlePluginUtil)
+ implementation(projects.common.analytics)
+ implementation(projects.common.util)
+
+ implementation(libs.ci.info)
+ implementation(libs.jgit)
+ implementation(libs.mixpanel)
}
+
+ kotlin.srcDirs(
+ layout.projectDirectory.dir("src/main/kotlin-compiler-attribute"),
+ )
}
}
buildConfig {
- generator(
- ExpectActualBuildConfigGenerator(
- isActualImplementation = false,
- internalVisibility = false,
- ),
- )
+// generator(
+// ExpectActualBuildConfigGenerator(
+// isActualImplementation = false,
+// internalVisibility = false,
+// ),
+// )
+
+ val shimImpl = project.provider { projects.gradle.gradlePluginShimImpl.dependencyProject }
+ buildConfigField("String", "SKIE_GRADLE_SHIM_IMPL_COORDINATE", shimImpl.map { it.dependencyCoordinate.enquoted() })
+// buildConfigField("String", "SKIE_GRADLE_SHIM_IMPL_COORDINATE", "")
+ val kotlinToSkieKgpVersion = project.kotlinToolingVersionDimension().components
+ .flatMap { versionComponent ->
+ versionComponent.supportedVersions.map { version ->
+ version to versionComponent.name
+ }
+ }
+ .joinToString { (version, name) ->
+ "${version.toString().enquoted()} to ${name.toString().enquoted()}"
+ }
- buildConfigField("String", "SKIE_GRADLE_SHIM_IMPL_COORDINATE", "")
- buildConfigField("co.touchlab.skie.util.StringMap", "KOTLIN_TO_SKIE_VERSION", "")
- buildConfigField("String", "SKIE_VERSION", "")
- buildConfigField("String", "SKIE_KOTLIN_PLUGIN_COORDINATE", "")
- buildConfigField("String", "SKIE_KOTLIN_RUNTIME_MODULE", "")
- buildConfigField("String", "SKIE_KOTLIN_RUNTIME_COORDINATE", "")
- buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "")
+ buildConfigField("co.touchlab.skie.util.StringMap", "KOTLIN_TO_SKIE_VERSION", "mapOf($kotlinToSkieKgpVersion)")
+// buildConfigField("co.touchlab.skie.util.StringMap", "KOTLIN_TO_SKIE_VERSION", "")
+ buildConfigField("String", "SKIE_VERSION", "\"${project.version}\"")
+// buildConfigField("String", "SKIE_VERSION", "")
+ val kotlinPlugin = project.provider { projects.kotlinCompiler.kotlinCompilerLinkerPlugin.dependencyProject }
+ buildConfigField("String", "SKIE_KOTLIN_PLUGIN_COORDINATE", kotlinPlugin.map { it.dependencyCoordinate.enquoted() })
+// buildConfigField("String", "SKIE_KOTLIN_PLUGIN_COORDINATE", "")
+ val runtime = project.provider { projects.runtime.runtimeKotlin.dependencyProject }
+ buildConfigField("String", "SKIE_KOTLIN_RUNTIME_MODULE", runtime.map { it.dependencyModule.enquoted() })
+ buildConfigField("String", "SKIE_KOTLIN_RUNTIME_GROUP", runtime.map { it.group.toString().enquoted() })
+ buildConfigField("String", "SKIE_KOTLIN_RUNTIME_NAME", runtime.map { it.name.enquoted() })
+ buildConfigField("String", "SKIE_KOTLIN_RUNTIME_VERSION", runtime.map { it.version.toString().enquoted() })
+// buildConfigField("String", "SKIE_KOTLIN_RUNTIME_MODULE", "")
+// buildConfigField("String", "SKIE_KOTLIN_RUNTIME_COORDINATE", "")
+// buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "")
+ buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "\"a4c9352b6713103c0f8621757a35b8c9\"")
}
-multiDimensionTarget.configureSourceSet { sourceSet ->
- if (!sourceSet.isTarget || compilation.isTest) {
- return@configureSourceSet
- }
-
- buildConfig {
- this.sourceSets.named(kotlinSourceSet.name).configure {
- generator(ExpectActualBuildConfigGenerator(isActualImplementation = true, internalVisibility = false))
- className.set("BuildConfig")
-
- val shimImpl = project.provider { projects.gradle.gradlePluginShimImpl.dependencyProject }
- buildConfigField("String", "SKIE_GRADLE_SHIM_IMPL_COORDINATE", shimImpl.map { it.dependencyCoordinate.enquoted() })
-
- val kotlinToSkieKgpVersion = project.kotlinToolingVersionDimension().components
- .flatMap { versionComponent ->
- versionComponent.supportedVersions.map { version ->
- version to versionComponent.name
- }
- }
- .joinToString { (version, name) ->
- "${version.toString().enquoted()} to ${name.toString().enquoted()}"
- }
-
- buildConfigField("co.touchlab.skie.util.StringMap", "KOTLIN_TO_SKIE_VERSION", "mapOf($kotlinToSkieKgpVersion)")
-
- buildConfigField("String", "SKIE_VERSION", "\"${project.version}\"")
-
- val kotlinPlugin = project.provider { projects.kotlinCompiler.kotlinCompilerLinkerPlugin.dependencyProject }
- buildConfigField("String", "SKIE_KOTLIN_PLUGIN_COORDINATE", kotlinPlugin.map { it.dependencyCoordinate.enquoted() })
-
- val runtime = project.provider { projects.runtime.runtimeKotlin.dependencyProject }
- buildConfigField("String", "SKIE_KOTLIN_RUNTIME_MODULE", runtime.map { it.dependencyModule.enquoted() })
- buildConfigField("String", "SKIE_KOTLIN_RUNTIME_COORDINATE", runtime.map { it.dependencyCoordinate.enquoted() })
-
- buildConfigField("String", "MIXPANEL_PROJECT_TOKEN", "\"a4c9352b6713103c0f8621757a35b8c9\"")
- }
- }
-}
+// multiDimensionTarget.configureSourceSet { sourceSet ->
+// if (!sourceSet.isTarget || compilation.isTest) {
+// return@configureSourceSet
+// }
+//
+// buildConfig {
+// this.sourceSets.named(kotlinSourceSet.name).configure {
+// generator(ExpectActualBuildConfigGenerator(isActualImplementation = true, internalVisibility = false))
+// className.set("BuildConfig")
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+// }
+// }
+// }
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinCompilerVersion.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin-compiler-attribute/co/touchlab/skie/gradle/KotlinToolingVersion.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/SkieGradlePluginApplier.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/SkieGradlePluginApplier.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/SkieGradlePluginApplier.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/SkieGradlePluginApplier.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/SkieInternalExtension.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/GradleAnalyticsManager.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/SkieUploadAnalyticsTask.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/environment/GradleEnvironmentAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/git/GitAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/hardware/HardwareAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/performance/GradlePerformanceAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/analytics/project/ProjectAnalytics.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/GradleSkieConfigurationData.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/configuration/GradleSkieConfigurationData.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/GradleSkieConfigurationData.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/configuration/GradleSkieConfigurationData.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieExtensionInternals.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieExtensionInternals.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/SkieExtensionInternals.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieExtensionInternals.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
similarity index 93%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
index f5c15cdb9..801e1f5cb 100644
--- a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
+++ b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/AddDependencyOnSkieRuntime.kt
@@ -13,6 +13,7 @@ import org.gradle.api.artifacts.ModuleIdentifier
import org.gradle.api.artifacts.ResolvedConfiguration
import org.gradle.api.artifacts.ResolvedDependency
+// TODO: Replace annotations with the correct archive for KGP version here
// Workaround for dependency pollution caused by SKIE prior 0.7.0 where SKIE added the runtime to published configurations.
// As a result, some libraries have dependencies on the runtime potentially with the wrong version of Kotlin.
fun Project.configureSkieRuntimeDependencySubstitution() {
@@ -79,7 +80,12 @@ private fun SkieTarget.getOrCreateSkieRuntimeConfiguration(): Configuration {
}
}
- project.dependencies.add(skieRuntimeConfigurationName, BuildConfig.SKIE_KOTLIN_RUNTIME_COORDINATE)
+ val runtimeCoordinate = listOf(
+ BuildConfig.SKIE_KOTLIN_RUNTIME_GROUP,
+ "${BuildConfig.SKIE_KOTLIN_RUNTIME_NAME}-${project.skieInternalExtension.kotlinVersion}",
+ BuildConfig.SKIE_KOTLIN_RUNTIME_VERSION,
+ ).joinToString(":")
+ project.dependencies.add(skieRuntimeConfigurationName, runtimeCoordinate)
return skieRuntimeConfiguration
}
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/coroutines/IsCoroutinesInteropEnabled.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/defaultarguments/DisableCachingForDefaultArguments.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/dependencies/SkieCompilerPluginDependencyProvider.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/directory/SkieDirectoriesManager.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/fatframework/FatFrameworkConfigurator.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/KgpShimLoader.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/KgpShimLoader.kt
similarity index 84%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/KgpShimLoader.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/KgpShimLoader.kt
index 03f26357e..b68cc0d70 100644
--- a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/KgpShimLoader.kt
+++ b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/KgpShimLoader.kt
@@ -29,13 +29,13 @@ object KgpShimLoader {
}
private fun Project.loadKgpShim(kotlinVersion: String): KgpShim? {
- registerKotlinCompilerVersionAttribute(kotlinVersion)
+// registerKotlinCompilerVersionAttribute(kotlinVersion)
- val skieGradleConfiguration = createSkieGradleShimImplConfiguration(kotlinVersion)
+// val skieGradleConfiguration = createSkieGradleShimImplConfiguration(kotlinVersion)
- val shimImplJar = skieGradleConfiguration.resolveOrRethrowFailure()
+// val shimImplJar = skieGradleConfiguration.resolveOrRethrowFailure()
- return createShimInstance(shimImplJar)
+ return createShimInstance(kotlinVersion)
}
private fun Project.registerKotlinCompilerVersionAttribute(kotlinVersion: String) {
@@ -74,10 +74,10 @@ object KgpShimLoader {
return this.resolve()
}
- private fun Project.createShimInstance(shimImplJar: Set): KgpShim? {
- val childClassLoader = createClassLoaderForShimClass(shimImplJar)
+ private fun Project.createShimInstance(kotlinVersion: String): KgpShim? {
+// val childClassLoader = createClassLoaderForShimClass(shimImplJar)
- val shimClass = loadShimClass(childClassLoader) ?: return null
+ val shimClass = loadShimClass(this@KgpShimLoader::class.java.classLoader, kotlinVersion) ?: return null
return shimClass.getConstructor(Project::class.java).newInstance(project) as KgpShim
}
@@ -93,8 +93,8 @@ object KgpShimLoader {
)
}
- private fun Project.loadShimClass(classLoader: ClassLoader): Class? {
- val shimClass = classLoader.loadClass("co.touchlab.skie.plugin.shim.ActualKgpShim")
+ private fun Project.loadShimClass(classLoader: ClassLoader, kotlinVersion: String): Class? {
+ val shimClass = classLoader.loadClass("co.touchlab.skie.plugin.shim.impl_${kotlinVersion.replace('.', '_')}.ActualKgpShim")
if (!KgpShim::class.java.isAssignableFrom(shimClass)) {
reportSkieLoaderError(
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/SkieKotlinVariantResolver.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/SkieKotlinVariantResolver.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/SkieKotlinVariantResolver.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/SkieKotlinVariantResolver.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/SkieLoaderError.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/SkieLoaderError.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/shim/SkieLoaderError.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/shim/SkieLoaderError.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubPluginManager.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/ProcessSwiftSourcesTask.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/ProcessSwiftSourcesTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/ProcessSwiftSourcesTask.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/ProcessSwiftSourcesTask.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/SwiftBundlingConfigurator.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/SwiftBundlingConfigurator.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/SwiftBundlingConfigurator.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/SwiftBundlingConfigurator.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/SwiftUnpackingConfigurator.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/SwiftUnpackingConfigurator.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/SwiftUnpackingConfigurator.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/SwiftUnpackingConfigurator.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/UnpackSwiftSourcesTask.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/UnpackSwiftSourcesTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/switflink/UnpackSwiftSourcesTask.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/switflink/UnpackSwiftSourcesTask.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/BaseSkieTask.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/InjectedFileSystemOperations.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/InjectedFileSystemOperations.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/InjectedFileSystemOperations.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/InjectedFileSystemOperations.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/JarUtils.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/JarUtils.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/JarUtils.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/JarUtils.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/SkieConfigurationProvider.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/SkieConfigurationProvider.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/SkieConfigurationProvider.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/SkieConfigurationProvider.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToKotlinCompilerPluginOption.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToKotlinCompilerPluginOption.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToKotlinCompilerPluginOption.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/SkiePluginOptionToKotlinCompilerPluginOption.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/TaskDoOptimized.kt
diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt b/SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt
rename to SKIE/skie-gradle/plugin-impl/src/main/kotlin/co/touchlab/skie/plugin/util/toPrettyJson.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts b/SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts
index dfe326bda..80e825ad6 100644
--- a/SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts
+++ b/SKIE/skie-gradle/plugin-shim-api/gradle-plugin-shim-api.gradle.kts
@@ -9,14 +9,12 @@ skiePublishing {
}
kotlin {
- sourceSets {
- val commonMain by getting {
- dependencies {
- api(projects.gradle.gradlePluginApi)
+ sourceSets.commonMain {
+ dependencies {
+ api(projects.gradle.gradlePluginApi)
- implementation(projects.common.util)
- implementation(projects.gradle.gradlePluginUtil)
- }
+ implementation(projects.common.util)
+ implementation(projects.gradle.gradlePluginUtil)
}
}
}
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/SkieTarget.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/SkieTarget.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/SkieTarget.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/SkieTarget.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/FatFrameworkTaskShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/FatFrameworkTaskShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/FatFrameworkTaskShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/FatFrameworkTaskShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/FrameworkShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/FrameworkShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/FrameworkShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/FrameworkShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KgpShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KgpShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KgpShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KgpShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KonanTargetShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KonanTargetShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KonanTargetShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KonanTargetShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeCompilationShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeCompilationShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeCompilationShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeCompilationShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeTargetShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeTargetShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeTargetShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KotlinNativeTargetShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KotlinSourceSetShim.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KotlinSourceSetShim.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/KotlinSourceSetShim.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/KotlinSourceSetShim.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/LaunchScheduler.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/LaunchScheduler.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/LaunchScheduler.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/shim/LaunchScheduler.kt
diff --git a/SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/util/KotlinCompilerPluginOption.kt b/SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinCompilerPluginOption.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/util/KotlinCompilerPluginOption.kt
rename to SKIE/skie-gradle/plugin-shim-api/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinCompilerPluginOption.kt
diff --git a/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts b/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts
index 98b8a16cf..c72b46ced 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts
+++ b/SKIE/skie-gradle/plugin-shim-impl/gradle-plugin-shim-impl.gradle.kts
@@ -1,5 +1,6 @@
plugins {
id("skie.shim")
+ // TODO: Remove
id("skie.publishable")
}
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.8.20/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.8.20/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
similarity index 81%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.8.20/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.8.20/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
index 3dfd79e9b..1a66295de 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.8.20/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.8.20/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
@@ -1,5 +1,6 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.LaunchScheduler
import org.gradle.api.Project
class LaunchSchedulerImpl : LaunchScheduler {
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.9.20/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kgp_1.8.0.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.9.20/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kgp_1.8.0.kt
similarity index 93%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.9.20/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kgp_1.8.0.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.9.20/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kgp_1.8.0.kt
index d85f9c3cc..737aecad5 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.9.20/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kgp_1.8.0.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.8.0..1.9.20/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kgp_1.8.0.kt
@@ -1,5 +1,6 @@
-package co.touchlab.skie.plugin.util
+package co.touchlab.skie.plugin.shim.impl.util
+import co.touchlab.skie.plugin.shim.impl.util.DarwinTarget
import org.jetbrains.kotlin.konan.target.KonanTarget
actual fun getAllSupportedDarwinTargets(): List =
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.9.0..2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.9.0..2.0.0/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
similarity index 85%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.9.0..2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.9.0..2.0.0/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
index e97b17ede..33cdb73c1 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.9.0..2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_1.9.0..2.0.0/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
@@ -1,7 +1,8 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.LaunchScheduler
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle
import org.jetbrains.kotlin.gradle.plugin.launchInRequiredStage
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kgp_2.0.0.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_2.0.0/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kgp_2.0.0.kt
similarity index 92%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kgp_2.0.0.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_2.0.0/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kgp_2.0.0.kt
index 30a64df20..696b51c7a 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kgp_2.0.0.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_2.0.0/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kgp_2.0.0.kt
@@ -1,5 +1,6 @@
-package co.touchlab.skie.plugin.util
+package co.touchlab.skie.plugin.shim.impl.util
+import co.touchlab.skie.plugin.shim.impl.util.DarwinTarget
import org.jetbrains.kotlin.konan.target.KonanTarget
actual fun getAllSupportedDarwinTargets(): List =
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
deleted file mode 100644
index d35fce13a..000000000
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package co.touchlab.skie.plugin.shim
-
-expect fun LaunchScheduler(): LaunchScheduler
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualFatFrameworkTaskShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualFatFrameworkTaskShim.kt
similarity index 74%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualFatFrameworkTaskShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualFatFrameworkTaskShim.kt
index f155bdb33..da679d6d8 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualFatFrameworkTaskShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualFatFrameworkTaskShim.kt
@@ -1,5 +1,7 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.FatFrameworkTaskShim
+import co.touchlab.skie.plugin.shim.FrameworkShim
import co.touchlab.skie.util.directory.FrameworkLayout
import org.jetbrains.kotlin.gradle.tasks.FatFrameworkTask
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualFrameworkShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualFrameworkShim.kt
similarity index 85%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualFrameworkShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualFrameworkShim.kt
index 7067006b7..5baa5dd5d 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualFrameworkShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualFrameworkShim.kt
@@ -1,6 +1,7 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
-import co.touchlab.skie.plugin.util.darwinTarget
+import co.touchlab.skie.plugin.shim.FrameworkShim
+import co.touchlab.skie.plugin.shim.impl.util.darwinTarget
import co.touchlab.skie.util.TargetTriple
import co.touchlab.skie.util.directory.FrameworkLayout
import org.jetbrains.kotlin.gradle.tasks.FrameworkDescriptor
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKgpShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKgpShim.kt
similarity index 93%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKgpShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKgpShim.kt
index f2c138b64..cb4152780 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKgpShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKgpShim.kt
@@ -1,10 +1,12 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
-import co.touchlab.skie.plugin.ActualSkieArtifactTarget
-import co.touchlab.skie.plugin.ActualSkieBinaryTarget
import co.touchlab.skie.plugin.SkieTarget
-import co.touchlab.skie.plugin.util.appleTargets
-import co.touchlab.skie.plugin.util.kotlinMultiplatformExtension
+import co.touchlab.skie.plugin.shim.FatFrameworkTaskShim
+import co.touchlab.skie.plugin.shim.KgpShim
+import co.touchlab.skie.plugin.shim.KonanTargetShim
+import co.touchlab.skie.plugin.shim.KotlinNativeTargetShim
+import co.touchlab.skie.plugin.shim.impl.util.appleTargets
+import co.touchlab.skie.plugin.shim.impl.util.kotlinMultiplatformExtension
import co.touchlab.skie.plugin.util.named
import co.touchlab.skie.plugin.util.withType
import org.gradle.api.NamedDomainObjectContainer
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKonanTargetShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKonanTargetShim.kt
similarity index 87%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKonanTargetShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKonanTargetShim.kt
index 2573c887c..333a0cbdf 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKonanTargetShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKonanTargetShim.kt
@@ -1,5 +1,6 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.KonanTargetShim
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.presetName
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinNativeCompilationShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinNativeCompilationShim.kt
similarity index 89%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinNativeCompilationShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinNativeCompilationShim.kt
index 29fb0df75..6b8a2f41c 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinNativeCompilationShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinNativeCompilationShim.kt
@@ -1,5 +1,8 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.KotlinNativeCompilationShim
+import co.touchlab.skie.plugin.shim.KotlinNativeTargetShim
+import co.touchlab.skie.plugin.shim.KotlinSourceSetShim
import co.touchlab.skie.util.directory.SkieCompilationDirectory
import org.gradle.api.DomainObjectSet
import org.gradle.api.Named
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinNativeTargetShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinNativeTargetShim.kt
similarity index 87%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinNativeTargetShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinNativeTargetShim.kt
index c2505f3f5..76180f69c 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinNativeTargetShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinNativeTargetShim.kt
@@ -1,5 +1,7 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.KotlinNativeCompilationShim
+import co.touchlab.skie.plugin.shim.KotlinNativeTargetShim
import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.model.ObjectFactory
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinSourceSetShim.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinSourceSetShim.kt
similarity index 88%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinSourceSetShim.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinSourceSetShim.kt
index dcd467948..4e48d6f59 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/shim/ActualKotlinSourceSetShim.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualKotlinSourceSetShim.kt
@@ -1,5 +1,6 @@
-package co.touchlab.skie.plugin.shim
+package co.touchlab.skie.plugin.shim.impl
+import co.touchlab.skie.plugin.shim.KotlinSourceSetShim
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
class ActualKotlinSourceSetShim(
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/ActualSkieArtifactTarget.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualSkieArtifactTarget.kt
similarity index 98%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/ActualSkieArtifactTarget.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualSkieArtifactTarget.kt
index 1b271ef32..ac4b74b33 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/ActualSkieArtifactTarget.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualSkieArtifactTarget.kt
@@ -1,7 +1,7 @@
-package co.touchlab.skie.plugin
+package co.touchlab.skie.plugin.shim.impl
import co.touchlab.skie.configuration.SkieConfigurationFlag
-import co.touchlab.skie.plugin.shim.ActualKonanTargetShim
+import co.touchlab.skie.plugin.SkieTarget
import co.touchlab.skie.plugin.shim.KonanTargetShim
import co.touchlab.skie.plugin.util.KotlinCompilerPluginOption
import co.touchlab.skie.plugin.util.lowerCamelCaseName
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/ActualSkieBinaryTarget.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualSkieBinaryTarget.kt
similarity index 96%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/ActualSkieBinaryTarget.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualSkieBinaryTarget.kt
index d900209f8..d455caa1d 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/ActualSkieBinaryTarget.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/ActualSkieBinaryTarget.kt
@@ -1,7 +1,7 @@
-package co.touchlab.skie.plugin
+package co.touchlab.skie.plugin.shim.impl
import co.touchlab.skie.configuration.SkieConfigurationFlag
-import co.touchlab.skie.plugin.shim.ActualKonanTargetShim
+import co.touchlab.skie.plugin.SkieTarget
import co.touchlab.skie.plugin.shim.KonanTargetShim
import co.touchlab.skie.plugin.shim.KotlinNativeCompilationShim
import co.touchlab.skie.plugin.util.KotlinCompilerPluginOption
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
new file mode 100644
index 000000000..909998272
--- /dev/null
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/LaunchSchedulerImpl.kt
@@ -0,0 +1,5 @@
+package co.touchlab.skie.plugin.shim.impl
+
+import co.touchlab.skie.plugin.shim.LaunchScheduler
+
+expect fun LaunchScheduler(): LaunchScheduler
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/AppleTargets.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/AppleTargets.kt
similarity index 80%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/AppleTargets.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/AppleTargets.kt
index 59a928a1a..875a03b44 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/AppleTargets.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/AppleTargets.kt
@@ -1,5 +1,6 @@
-package co.touchlab.skie.plugin.util
+package co.touchlab.skie.plugin.shim.impl.util
+import co.touchlab.skie.plugin.util.withType
import org.gradle.api.NamedDomainObjectCollection
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kt
similarity index 95%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kt
index 370580a22..d29fd46aa 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/DarwinTarget.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/DarwinTarget.kt
@@ -1,4 +1,4 @@
-package co.touchlab.skie.plugin.util
+package co.touchlab.skie.plugin.shim.impl.util
import co.touchlab.skie.util.TargetTriple
import org.jetbrains.kotlin.gradle.tasks.FrameworkDescriptor
diff --git a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinMultiplatformExtension.kt b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/KotlinMultiplatformExtension.kt
similarity index 84%
rename from SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinMultiplatformExtension.kt
rename to SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/KotlinMultiplatformExtension.kt
index c70332b89..1c2a2d1e5 100644
--- a/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/gradle_common/kotlin/co/touchlab/skie/plugin/util/KotlinMultiplatformExtension.kt
+++ b/SKIE/skie-gradle/plugin-shim-impl/src/kgp_common/kotlin/co/touchlab/skie/plugin/shim/impl/util/KotlinMultiplatformExtension.kt
@@ -1,4 +1,4 @@
-package co.touchlab.skie.plugin.util
+package co.touchlab.skie.plugin.shim.impl.util
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
diff --git a/SKIE/skie-gradle/plugin-util/gradle-plugin-util.gradle.kts b/SKIE/skie-gradle/plugin-util/gradle-plugin-util.gradle.kts
index 6602c859b..2e464b5a2 100644
--- a/SKIE/skie-gradle/plugin-util/gradle-plugin-util.gradle.kts
+++ b/SKIE/skie-gradle/plugin-util/gradle-plugin-util.gradle.kts
@@ -1,5 +1,6 @@
plugins {
id("skie.gradle")
+ // TODO: Remove
id("skie.publishable")
}
@@ -7,12 +8,3 @@ skiePublishing {
name = "SKIE Gradle Plugin utils"
description = "Internal utilities for SKIE Gradle plugin."
}
-
-kotlin {
- sourceSets {
- val commonMain by getting {
- dependencies {
- }
- }
- }
-}
diff --git a/SKIE/skie-gradle/plugin-util/src/common/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt b/SKIE/skie-gradle/plugin-util/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-util/src/common/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt
rename to SKIE/skie-gradle/plugin-util/src/main/kotlin/co/touchlab/skie/plugin/util/KotlinDsl.kt
diff --git a/SKIE/skie-gradle/plugin-util/src/common/kotlin/co/touchlab/skie/plugin/util/LowerCamelCaseName.kt b/SKIE/skie-gradle/plugin-util/src/main/kotlin/co/touchlab/skie/plugin/util/LowerCamelCaseName.kt
similarity index 100%
rename from SKIE/skie-gradle/plugin-util/src/common/kotlin/co/touchlab/skie/plugin/util/LowerCamelCaseName.kt
rename to SKIE/skie-gradle/plugin-util/src/main/kotlin/co/touchlab/skie/plugin/util/LowerCamelCaseName.kt
diff --git a/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts b/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts
index 4a21cf546..5a6752b3a 100644
--- a/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts
+++ b/SKIE/skie-gradle/plugin/gradle-plugin.gradle.kts
@@ -2,10 +2,18 @@ import co.touchlab.skie.gradle.KotlinCompilerVersion
import co.touchlab.skie.gradle.util.gradlePluginApi
import co.touchlab.skie.gradle.version.gradleApiVersionDimension
import co.touchlab.skie.gradle.version.kotlinToolingVersionDimension
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
id("skie.gradle.plugin")
id("skie.publishable")
+
+ id("com.github.johnrengelman.shadow") version "8.1.1"
+}
+
+tasks.shadowJar {
+ archiveClassifier.set("")
}
skiePublishing {
@@ -19,6 +27,35 @@ configurations.configureEach {
}
}
+kotlinToolingVersionDimension().components.forEach { kotlinToolingVersion ->
+ val safeKotlinVersion = kotlinToolingVersion.value.replace('.', '_')
+ val configuration = configurations.create("shim-relocation-kgp_$safeKotlinVersion") {
+ attributes {
+ attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.value))
+ }
+ }
+
+ val relocationTask = tasks.register("relocate-shim-kgp_$safeKotlinVersion") {
+ relocate("co.touchlab.skie.plugin.shim.impl", "co.touchlab.skie.plugin.shim.impl_$safeKotlinVersion")
+ configurations = listOf(configuration)
+ archiveClassifier = "kgp_$safeKotlinVersion"
+ dependencies {
+// exclude("**/*.kotlin_metadata")
+// exclude("**/*.kotlin_module")
+// exclude("**/*.kotlin_builtins")
+ }
+ }
+
+ tasks.named("compileKotlin").configure {
+ dependsOn(relocationTask)
+ }
+
+ dependencies {
+ configuration(projects.gradle.gradlePluginShimImpl)
+ runtimeOnly(relocationTask.map { it.outputs.files })
+ }
+}
+
dependencies {
api(projects.gradle.gradlePluginApi)
implementation(projects.gradle.gradlePluginImpl)
@@ -26,30 +63,30 @@ dependencies {
compileOnly(gradlePluginApi())
}
-tasks.named("compileKotlin").configure {
- val gradleApiVersions = project.gradleApiVersionDimension()
- val kotlinToolingVersions = project.kotlinToolingVersionDimension()
-
- gradleApiVersions.components.forEach { gradleApiVersion ->
- kotlinToolingVersions.components.forEach { kotlinToolingVersion ->
- val shimConfiguration = configurations.detachedConfiguration(
- projects.gradle.gradlePluginShimImpl,
- ).apply {
- attributes {
- attribute(
- KotlinCompilerVersion.attribute,
- objects.named(KotlinCompilerVersion::class.java, kotlinToolingVersion.value),
- )
- attribute(
- GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
- objects.named(GradlePluginApiVersion::class.java, gradleApiVersion.value),
- )
- }
- }
- dependsOn(shimConfiguration)
- }
- }
-}
+// tasks.named("compileKotlin").configure {
+// val gradleApiVersions = project.gradleApiVersionDimension()
+// val kotlinToolingVersions = project.kotlinToolingVersionDimension()
+//
+// gradleApiVersions.components.forEach { gradleApiVersion ->
+// kotlinToolingVersions.components.forEach { kotlinToolingVersion ->
+// val shimConfiguration = configurations.detachedConfiguration(
+// projects.gradle.gradlePluginShimImpl,
+// ).apply {
+// attributes {
+// attribute(
+// KotlinCompilerVersion.attribute,
+// objects.named(KotlinCompilerVersion::class.java, kotlinToolingVersion.value),
+// )
+// attribute(
+// GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
+// objects.named(GradlePluginApiVersion::class.java, gradleApiVersion.value),
+// )
+// }
+// }
+// dependsOn(shimConfiguration)
+// }
+// }
+// }
@Suppress("UnstableApiUsage")
gradlePlugin {
diff --git a/SKIE/skie-gradle/sub-plugin-api/gradle-sub-plugin-api.gradle.kts b/SKIE/skie-gradle/sub-plugin-api/gradle-sub-plugin-api.gradle.kts
index 8960f3519..fdac711cd 100644
--- a/SKIE/skie-gradle/sub-plugin-api/gradle-sub-plugin-api.gradle.kts
+++ b/SKIE/skie-gradle/sub-plugin-api/gradle-sub-plugin-api.gradle.kts
@@ -9,12 +9,10 @@ skiePublishing {
}
kotlin {
- sourceSets {
- val commonMain by getting {
- dependencies {
- api(projects.gradle.gradlePluginApi)
- api(projects.gradle.gradlePluginShimApi)
- }
+ sourceSets.commonMain {
+ dependencies {
+ api(projects.gradle.gradlePluginApi)
+ api(projects.gradle.gradlePluginShimApi)
}
}
}
diff --git a/SKIE/skie-gradle/sub-plugin-api/src/common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt b/SKIE/skie-gradle/sub-plugin-api/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt
similarity index 100%
rename from SKIE/skie-gradle/sub-plugin-api/src/common/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt
rename to SKIE/skie-gradle/sub-plugin-api/src/main/kotlin/co/touchlab/skie/plugin/subplugin/SkieSubplugin.kt
diff --git a/build-setup/build.gradle.kts b/build-setup/build.gradle.kts
index 9923ce6c1..eea20c5d2 100644
--- a/build-setup/build.gradle.kts
+++ b/build-setup/build.gradle.kts
@@ -60,6 +60,11 @@ gradlePlugin {
implementationClass = "co.touchlab.skie.buildsetup.plugins.OptInExperimentalCompilerApi"
}
+ plugins.register("skie.base") {
+ id = "skie.base"
+ implementationClass = "co.touchlab.skie.buildsetup.plugins.SkieBase"
+ }
+
plugins.register("skie.common") {
id = "skie.common"
implementationClass = "co.touchlab.skie.buildsetup.plugins.SkieCommon"
diff --git a/build-setup/src/main/kotlin-compiler-attribute-local b/build-setup/src/main/kotlin-compiler-attribute-local
index 5a790a35d..7ed72c980 120000
--- a/build-setup/src/main/kotlin-compiler-attribute-local
+++ b/build-setup/src/main/kotlin-compiler-attribute-local
@@ -1 +1 @@
-../../../SKIE/skie-gradle/plugin-impl/src/common/kotlin-compiler-attribute
\ No newline at end of file
+../../../SKIE/skie-gradle/plugin-impl/src/main/kotlin-compiler-attribute
\ No newline at end of file
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt
index b2b0a7004..a739c2f93 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/DevAcceptanceTests.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExternalKotlinTargetApi::class, ExperimentalKotlinGradlePluginApi::class)
+
package co.touchlab.skie.buildsetup.plugins
import co.touchlab.skie.buildsetup.plugins.extensions.DevAcceptanceTestsExtension
@@ -17,6 +19,7 @@ import co.touchlab.skie.gradle.version.target.MultiDimensionTargetPlugin
import co.touchlab.skie.gradle.version.target.Target
import co.touchlab.skie.gradle.version.target.latest
import com.github.gmazzo.gradle.plugins.BuildConfigExtension
+import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
@@ -33,14 +36,40 @@ import org.gradle.kotlin.dsl.named
import org.gradle.kotlin.dsl.project
import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.gradle.language.jvm.tasks.ProcessResources
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
+// import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.ExternalKotlinCompilationDescriptor
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.ExternalKotlinTargetDescriptor
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.createCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.createExternalKotlinTarget
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlinx.serialization.gradle.SerializationGradleSubplugin
import java.io.File
+class MultiDimensionalJvmTarget(delegate: Delegate): DecoratedExternalKotlinTarget(delegate)/*, HasConfigurableKotlinCompilerOptions*/ {
+ @Suppress("UNCHECKED_CAST")
+ override val compilations: NamedDomainObjectContainer
+ get() = super.compilations as NamedDomainObjectContainer
+
+// override val compilerOptions: KotlinJvmCompilerOptions
+// get() = super.compilerOptions as KotlinJvmCompilerOptions
+}
+
+class MultiDimensionalJvmCompilation(delegate: Delegate): DecoratedExternalKotlinCompilation(delegate) {
+
+}
+
abstract class DevAcceptanceTests : Plugin {
override fun apply(project: Project) = with(project) {
@@ -55,21 +84,44 @@ abstract class DevAcceptanceTests : Plugin {
configureExpectedBuildConfig()
val latestKotlin = kotlinToolingVersionDimension().latest
- acceptanceTestsDimension().components.forEach { testType ->
- tasks.register("${testType.value}__kgp_latestTest") {
- group = LifecycleBasePlugin.VERIFICATION_GROUP
- dependsOn(tasks.named("${testType.value}__kgp_${latestKotlin.value}Test"))
+ tasks.register("kgp_latestTest") {
+ group = LifecycleBasePlugin.VERIFICATION_GROUP
+ dependsOn(tasks.named("kgp_${latestKotlin.value}Test"))
+ }
+
+ extensions.configure() {
+ sourceSets.commonTest {
+ dependencies {
+ implementation(project(":acceptance-tests:acceptance-tests-framework"))
+ implementation(project(":common:util"))
+ }
}
}
extensions.configure {
- dimensions(acceptanceTestsDimension(), kotlinToolingVersionDimension()) { target ->
- val acceptanceTestType = target.acceptanceTest
+ dimensions(kotlinToolingVersionDimension()) { target ->
+// val acceptanceTestType = target.acceptanceTest
val kotlinToolingVersion = target.kotlinToolingVersion
+ val _kotlinTarget = createExternalKotlinTarget {
+ this.targetName = "_" + target.name
+ this.platformType = KotlinPlatformType.jvm
+ this.targetFactory = ExternalKotlinTargetDescriptor.TargetFactory(::MultiDimensionalJvmTarget)
+
+ this.configure { target ->
+ (target as KotlinTarget).attributes {
+ attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.value))
+ }
+ }
+ }
+ val _mainCompilation = _kotlinTarget.createCompilation {
+ compilationName = KotlinCompilation.MAIN_COMPILATION_NAME
+ compilationFactory = ExternalKotlinCompilationDescriptor.CompilationFactory(::MultiDimensionalJvmCompilation)
+ defaultSourceSet = sourceSets.maybeCreate(compilationName)
+ }
+
val kotlinTarget = jvm(target.name) {
attributes {
attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.value))
- attribute(Attribute.of("co.touchlab.skie.dev.acceptance-test", String::class.java), acceptanceTestType.value)
}
}
@@ -89,6 +141,7 @@ abstract class DevAcceptanceTests : Plugin {
}
dependencies {
testDependencies(project(":common:configuration:configuration-annotations"))
+// testDependencies(project(":configuration_annotations_impl_2_0_0"))
skieIosArm64KotlinRuntimeDependency(project(":runtime:runtime-kotlin")) {
attributes {
attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.value))
@@ -100,11 +153,6 @@ abstract class DevAcceptanceTests : Plugin {
attribute(KotlinCompilerVersion.attribute, objects.named(kotlinToolingVersion.value))
}
}
-
- if (acceptanceTestType == AcceptanceTestsComponent.typeMapping) {
- testDependencies(project(":acceptance-tests:test-dependencies:regular-dependency"))
- exportedTestDependencies(project(":acceptance-tests:test-dependencies:exported-dependency"))
- }
}
devAcceptanceTests.getTests(target).configureEach {
@@ -177,7 +225,7 @@ abstract class DevAcceptanceTests : Plugin {
).optional(true)
outputs.dir(
- testDirectory(project, acceptanceTestType, kotlinToolingVersion),
+ testDirectory(project, kotlinToolingVersion),
)
maxHeapSize = "12g"
@@ -195,7 +243,6 @@ abstract class DevAcceptanceTests : Plugin {
configureActualBuildConfig(
target = target,
- acceptanceTestType = acceptanceTestType,
testDependencies = testDependencies,
exportedTestDependencies = exportedTestDependencies,
skieIosArm64KotlinRuntimeDependency = skieIosArm64KotlinRuntimeDependency,
@@ -266,7 +313,6 @@ abstract class DevAcceptanceTests : Plugin {
testDependencies: Configuration,
exportedTestDependencies: Configuration,
skieIosArm64KotlinRuntimeDependency: Configuration,
- acceptanceTestType: AcceptanceTestsComponent,
kotlinToolingVersion: KotlinToolingVersionComponent,
kotlinTarget: KotlinJvmTarget,
) {
@@ -280,7 +326,10 @@ abstract class DevAcceptanceTests : Plugin {
val resolvedDependencies = provider { testDependencies.resolve() }
val exportedDependencies = provider { exportedTestDependencies.resolve() }
- val skieIosArm64KotlinRuntimeKlib = provider { skieIosArm64KotlinRuntimeDependency.resolve().single() }
+ val skieIosArm64KotlinRuntimeKlib = provider {
+ println(skieIosArm64KotlinRuntimeDependency.resolve().joinToString("\n") { "- ${it.absolutePath}"})
+ skieIosArm64KotlinRuntimeDependency.resolve().single()
+ }
buildConfigField(
type = "String",
@@ -294,7 +343,7 @@ abstract class DevAcceptanceTests : Plugin {
buildConfigField(
type = "String",
name = "BUILD",
- value = testDirectory(project, acceptanceTestType, kotlinToolingVersion)
+ value = testDirectory(project, kotlinToolingVersion)
.map { it.asFile.absolutePath.enquoted() },
)
buildConfigField(
@@ -354,11 +403,10 @@ abstract class DevAcceptanceTests : Plugin {
fun testDirectory(
project: Project,
- testType: AcceptanceTestsComponent,
kotlinToolingVersion: KotlinToolingVersionComponent,
): Provider {
return project.layout.buildDirectory.map {
- it.dir(testType.value).dir(kotlinToolingVersion.value)
+ it.dir(kotlinToolingVersion.value)
}
}
}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieBase.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieBase.kt
index d0bedabfd..7edb1d2bc 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieBase.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieBase.kt
@@ -1,5 +1,6 @@
package co.touchlab.skie.buildsetup.plugins
+import co.touchlab.skie.gradle.KotlinCompilerVersion
import co.touchlab.skie.gradle.util.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
@@ -20,6 +21,8 @@ abstract class SkieBase : Plugin {
version = System.getenv("RELEASE_VERSION").orEmpty().ifBlank { "1.0.0-SNAPSHOT" }
plugins.withType().configureEach {
+ KotlinCompilerVersion.registerIn(project.dependencies, pluginVersion)
+
extensions.configure {
jvmToolchain(libs.versions.java)
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieCompiler.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieCompiler.kt
index 4cfc6b3fe..19e72e4a1 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieCompiler.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieCompiler.kt
@@ -16,6 +16,7 @@ import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.named
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
abstract class SkieCompiler : Plugin {
@@ -30,6 +31,17 @@ abstract class SkieCompiler : Plugin {
attributes {
attribute(KotlinCompilerVersion.attribute, objects.named(target.kotlinToolingVersion.value))
}
+
+ this.compilations.all {
+ this.compileTaskProvider.configure {
+ withKotlinNativeCompilerEmbeddableDependency(target.kotlinToolingVersion.primaryVersion, isTarget = true) {
+ val kotlinCompilerApiConfiguration = project.configurations.detachedConfiguration(it)
+ (this as KotlinCompile).friendPaths.from(
+ kotlinCompilerApiConfiguration
+ )
+ }
+ }
+ }
}
}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieGradle.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieGradle.kt
index 806330644..62e2c711d 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieGradle.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieGradle.kt
@@ -1,47 +1,84 @@
package co.touchlab.skie.buildsetup.plugins
-import co.touchlab.skie.gradle.version.gradleApiVersion
-import co.touchlab.skie.gradle.version.gradleApiVersionDimension
-import co.touchlab.skie.gradle.version.target.MultiDimensionTargetExtension
-import co.touchlab.skie.gradle.version.target.MultiDimensionTargetPlugin
+import co.touchlab.skie.gradle.util.compileOnly
+import co.touchlab.skie.gradle.util.libs
+import co.touchlab.skie.gradle.util.testImplementation
+import co.touchlab.skie.gradle.version.ToolingVersions
import org.gradle.api.Plugin
import org.gradle.api.Project
-import org.gradle.api.attributes.Bundling
-import org.gradle.api.attributes.plugin.GradlePluginApiVersion
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.dependencies
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
abstract class SkieGradle : Plugin {
override fun apply(project: Project): Unit = with(project) {
apply()
- apply()
+// apply()
+
+ project.apply()
apply()
- extensions.configure {
- dimensions(gradleApiVersionDimension()) { target ->
- jvm(target.name) {
- attributes {
- attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(target.gradleApiVersion.value))
- attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
- }
- }
- }
+ val gradleVersion = ToolingVersions.Gradle.`7․3`
+ val kotlinVersion = gradleVersion.kotlinVersion.toString()
+ val groovyVersion = gradleVersion.groovyVersion
+
+ val weakDependencies = listOf(
+ "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion",
+ "dev.gradleplugins:gradle-api:${gradleVersion.gradleVersion.version}",
+ "org.codehaus.groovy:groovy-json:$groovyVersion",
+ )
+
+ extensions.configure {
+ jvmToolchain(libs.versions.java)
- configureSourceSet { sourceSet ->
- val gradleApiVersion = sourceSet.gradleApiVersion
+ jvm()
- val gradleVersion = gradleApiVersion.value
- val kotlinVersion = gradleApiVersion.version.kotlinVersion.toString()
- val groovyVersion = sourceSet.gradleApiVersion.version.groovyVersion
+ sourceSets.commonMain {
+ kotlin.srcDirs("src/main/kotlin")
+ }
+
+ weakDependencies.forEach { dependency ->
+ sourceSets.commonMain {
+ dependencies {
+ compileOnly(dependency)
+ }
+ }
- dependencies {
- weak("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
- weak("dev.gradleplugins:gradle-api:$gradleVersion")
- weak("org.codehaus.groovy:groovy-json:$groovyVersion")
+ sourceSets.commonTest {
+ dependencies {
+ implementation(dependency)
+ }
}
}
}
+
+// extensions.configure {
+// dimensions(gradleApiVersionDimension()) { target ->
+// jvm(target.name) {
+// attributes {
+// attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(target.gradleApiVersion.value))
+// attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+// }
+// }
+// }
+//
+// configureSourceSet { sourceSet ->
+// val gradleApiVersion = sourceSet.gradleApiVersion
+//
+// val gradleVersion = gradleApiVersion.value
+// val kotlinVersion = gradleApiVersion.version.kotlinVersion.toString()
+// val groovyVersion = sourceSet.gradleApiVersion.version.groovyVersion
+//
+// dependencies {
+// weak("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+// weak("dev.gradleplugins:gradle-api:$gradleVersion")
+// weak("org.codehaus.groovy:groovy-json:$groovyVersion")
+// }
+// }
+// }
}
}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt
index 465ea7305..76c7cecb8 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishable.kt
@@ -33,7 +33,7 @@ abstract class SkiePublishable : Plugin, HasMavenPublishPlugin, HasSign
configureMetadata(extension)
configureKotlinJvmPublicationIfNeeded()
configureSourcesJar(extension)
- configureJavadocJar()
+ configureJavadocJar(extension)
}
private fun Project.configureSmokeTestTmpRepository() {
@@ -146,7 +146,7 @@ abstract class SkiePublishable : Plugin, HasMavenPublishPlugin, HasSign
val sourcesJar = tasks.register("${publication.name}SourcesJar", Jar::class) {
archiveClassifier.set("sources")
// Each archive name should be distinct.
- archiveBaseName.set("${archiveBaseName.get()}-${publication.name}")
+ archiveBaseName.set("${archiveBaseName.orNull ?: project.name}-${publication.name}")
}
artifact(sourcesJar)
}
@@ -154,21 +154,22 @@ abstract class SkiePublishable : Plugin, HasMavenPublishPlugin, HasSign
}
}
- private fun Project.configureJavadocJar() = afterEvaluate {
+ private fun Project.configureJavadocJar(extension: SkiePublishingExtension) = afterEvaluate {
// Gradle plugin already sets up Javadoc publishing
if (plugins.hasPlugin(JavaGradlePluginPlugin::class.java)) {
return@afterEvaluate
}
- publishing.publications.withType {
- val publication = this
- val javadocJar = tasks.register("${publication.name}JavadocJar", Jar::class) {
- archiveClassifier.set("javadoc")
- // Each archive name should be distinct. Mirror the format for the sources Jar tasks.
- archiveBaseName.set("${archiveBaseName.get()}-${publication.name}")
+ if (!extension.publishJavadoc.get()) {
+ publishing.publications.withType {
+ val publication = this
+ val javadocJar = tasks.register("${publication.name}JavadocJar", Jar::class) {
+ archiveClassifier.set("javadoc")
+ // Each archive name should be distinct. Mirror the format for the sources Jar tasks.
+ archiveBaseName.set("${archiveBaseName.orNull ?: project.name}-${publication.name}")
+ }
+ artifact(javadocJar)
}
- artifact(javadocJar)
}
-
}
}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishingExtension.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishingExtension.kt
index f4c2011ed..caca8b891 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishingExtension.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkiePublishingExtension.kt
@@ -8,6 +8,7 @@ import javax.inject.Inject
abstract class SkiePublishingExtension @Inject constructor(objects: ObjectFactory) {
val publishSources: Property = objects.property().convention(true)
+ val publishJavadoc: Property = objects.property().convention(false)
val name: Property = objects.property()
val description: Property = objects.property()
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieShim.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieShim.kt
index 172e2ba8e..cbc37a63d 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieShim.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieShim.kt
@@ -1,6 +1,7 @@
package co.touchlab.skie.buildsetup.plugins
import co.touchlab.skie.gradle.KotlinCompilerVersion
+import co.touchlab.skie.gradle.version.ToolingVersions
import co.touchlab.skie.gradle.version.gradleApiVersion
import co.touchlab.skie.gradle.version.gradleApiVersionDimension
import co.touchlab.skie.gradle.version.kotlinToolingVersion
@@ -21,24 +22,23 @@ abstract class SkieShim : Plugin {
apply()
apply()
+ val gradleApiVersion = ToolingVersions.Gradle.`7․3`
extensions.configure {
- dimensions(kotlinToolingVersionDimension(), gradleApiVersionDimension()) { target ->
+ dimensions(kotlinToolingVersionDimension()) { target ->
jvm(target.name) {
attributes {
attribute(KotlinCompilerVersion.attribute, objects.named(target.kotlinToolingVersion.value))
- attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(target.gradleApiVersion.value))
}
}
}
configureSourceSet { sourceSet ->
val kotlinToolingVersion = sourceSet.kotlinToolingVersion.primaryVersion
- val gradleApiVersion = sourceSet.gradleApiVersion.value
- val kotlinVersion = sourceSet.gradleApiVersion.version.kotlinVersion.toString()
+ val kotlinVersion = gradleApiVersion.kotlinVersion.toString()
dependencies {
weak("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
- weak("dev.gradleplugins:gradle-api:$gradleApiVersion")
+ weak("dev.gradleplugins:gradle-api:${gradleApiVersion.gradleVersion.version}")
weak("org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlinToolingVersion")
weak("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinToolingVersion")
}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/tasks/BuildNestedGradle.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/tasks/BuildNestedGradle.kt
new file mode 100644
index 000000000..350342c1a
--- /dev/null
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/tasks/BuildNestedGradle.kt
@@ -0,0 +1,32 @@
+package co.touchlab.skie.buildsetup.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.TaskAction
+import org.gradle.tooling.GradleConnector
+
+
+abstract class BuildNestedGradle: DefaultTask() {
+
+ @get:InputDirectory
+ abstract val projectDir: DirectoryProperty
+
+ @get:Input
+ abstract val tasks: ListProperty
+
+ @TaskAction
+ fun buildNestedGradle() {
+ val connection = GradleConnector.newConnector()
+ .forProjectDirectory(projectDir.get().asFile)
+ .connect()
+
+ connection.newBuild()
+ .forTasks(*tasks.get().toTypedArray())
+ .setStandardOutput(System.out)
+ .setStandardError(System.err)
+ .run()
+ }
+}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/DependencyHandlerExtensions.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/DependencyHandlerExtensions.kt
index 4a118e030..47a97b797 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/DependencyHandlerExtensions.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/DependencyHandlerExtensions.kt
@@ -3,6 +3,9 @@ package co.touchlab.skie.gradle.util
import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.dsl.DependencyHandler
+internal fun DependencyHandler.compileOnly(dependencyNotation: Any): Dependency? =
+ add("compileOnly", dependencyNotation)
+
internal fun DependencyHandler.implementation(dependencyNotation: Any): Dependency? =
add("implementation", dependencyNotation)
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt
index 95d0a4aa3..d01423165 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/util/KotlinNativeCompilerHome.kt
@@ -6,7 +6,7 @@ import org.gradle.api.artifacts.Dependency
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.provideDelegate
import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
-import org.jetbrains.kotlin.konan.CompilerVersion
+// import org.jetbrains.kotlin.konan.CompilerVersion
import java.io.File
private sealed interface BackupProperty {
@@ -26,24 +26,24 @@ private object KotlinNativeDownloaderProperties {
}
fun Project.kotlinNativeCompilerHome(kotlinVersion: KotlinToolingVersion): File {
- return NativeCompilerDownloader(project, CompilerVersion.fromString(kotlinVersion.toString()))
- .also { downloader ->
- val originalVersionProperty = backupProperty(getKotlinNativeVersionPropertyName())
- val originalDownloadFromMavenProperty = backupProperty(KotlinNativeDownloaderProperties.downloadFromMaven)
+ val originalVersionProperty = backupProperty(getKotlinNativeVersionPropertyName())
+ val originalDownloadFromMavenProperty = backupProperty(KotlinNativeDownloaderProperties.downloadFromMaven)
- extra.set(KotlinNativeDownloaderProperties.main, kotlinVersion.toString())
- if (kotlinVersion >= KotlinToolingVersion("1.9.20")) {
- extra.set(KotlinNativeDownloaderProperties.downloadFromMaven, "true")
- }
+ extra.set(KotlinNativeDownloaderProperties.main, kotlinVersion.toString())
+ if (kotlinVersion >= KotlinToolingVersion("1.9.20")) {
+ extra.set(KotlinNativeDownloaderProperties.downloadFromMaven, "true")
+ }
- downloader.downloadIfNeeded()
+ val downloader = NativeCompilerDownloader(project)
+ downloader.downloadIfNeeded()
+ val compilerDirectory = downloader.compilerDirectory
- extra.set(KotlinNativeDownloaderProperties.main, null)
+ extra.set(KotlinNativeDownloaderProperties.main, null)
- restoreProperty(originalVersionProperty)
- restoreProperty(originalDownloadFromMavenProperty)
- }
- .compilerDirectory
+ restoreProperty(originalVersionProperty)
+ restoreProperty(originalDownloadFromMavenProperty)
+
+ return compilerDirectory
}
private fun Project.getKotlinNativeVersionPropertyName(): String =
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/DarwinPlatformComponent.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/DarwinPlatformComponent.kt
index 115c1110e..2144dd70f 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/DarwinPlatformComponent.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/DarwinPlatformComponent.kt
@@ -2,25 +2,29 @@ package co.touchlab.skie.gradle.version
import co.touchlab.skie.gradle.version.target.Target
-enum class DarwinPlatformComponent : Target.Component {
- iosArm32,
- iosArm64,
- iosX64,
- iosSimulatorArm64,
+enum class DarwinPlatformComponent(
+ val kotlinNativeTarget: String,
+ val sinceKotlinVersion: String? = null,
+ val untilKotlinVersionExclusive: String? = null
+) : Target.Component {
+// iosArm32("ios_arm32", untilKotlinVersionExclusive = "2.0.0"),
+ iosArm64("ios_arm64"),
+ iosX64("ios_x64"),
+ iosSimulatorArm64("ios_simulator_arm64"),
- watchosArm32,
- watchosArm64,
- watchosDeviceArm64,
- watchosX86,
- watchosX64,
- watchosSimulatorArm64,
+ watchosArm32("watchos_arm32"),
+ watchosArm64("watchos_arm64"),
+ watchosDeviceArm64("watchos_device_arm64", sinceKotlinVersion = "1.8.20"),
+// watchosX86("watchos_x86", untilKotlinVersionExclusive = "2.0.0"),
+ watchosX64("watchos_x64"),
+ watchosSimulatorArm64("watchos_simulator_arm64"),
- tvosArm64,
- tvosX64,
- tvosSimulatorArm64,
+ tvosArm64("tvos_arm64"),
+ tvosX64("tvos_x64"),
+ tvosSimulatorArm64("tvos_simulator_arm64"),
- macosX64,
- macosArm64;
+ macosX64("macos_x64"),
+ macosArm64("macos_arm64");
override val value: String get() = name
}
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/SupportedVersions.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/SupportedVersions.kt
index 083c29e07..1c2a8d4f7 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/SupportedVersions.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/SupportedVersions.kt
@@ -60,7 +60,7 @@ fun Project.darwinPlatformDimension(): Target.Dimension
components = DarwinPlatformComponent.values().toSet(),
aliases = mapOf(
"ios" to setOf(
- DarwinPlatformComponent.iosArm32,
+// DarwinPlatformComponent.iosArm32,
DarwinPlatformComponent.iosArm64,
DarwinPlatformComponent.iosX64,
DarwinPlatformComponent.iosSimulatorArm64,
@@ -69,7 +69,7 @@ fun Project.darwinPlatformDimension(): Target.Dimension
DarwinPlatformComponent.watchosArm32,
DarwinPlatformComponent.watchosArm64,
DarwinPlatformComponent.watchosDeviceArm64,
- DarwinPlatformComponent.watchosX86,
+// DarwinPlatformComponent.watchosX86,
DarwinPlatformComponent.watchosX64,
DarwinPlatformComponent.watchosSimulatorArm64,
),
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/DefaultConfigureSourceSetScope.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/DefaultConfigureSourceSetScope.kt
index 396bfbd63..5f89d14bb 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/DefaultConfigureSourceSetScope.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/DefaultConfigureSourceSetScope.kt
@@ -27,6 +27,9 @@ class DefaultConfigureSourceSetScope(
}
}
+ private val KotlinSourceSet.relatedConfigurationNames: List
+ get() = listOf(apiConfigurationName, implementationConfigurationName, compileOnlyConfigurationName, runtimeOnlyConfigurationName)
+
private inner class DependencyHandler(
kotlinDependencyHandler: KotlinDependencyHandler,
) : MultiDimensionTargetDependencyHandler, KotlinDependencyHandler by kotlinDependencyHandler {
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/MultiDimensionTargetConfigurer.kt b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/MultiDimensionTargetConfigurer.kt
index f2b986ad0..ac3860174 100644
--- a/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/MultiDimensionTargetConfigurer.kt
+++ b/build-setup/src/main/kotlin/co/touchlab/skie/gradle/version/target/MultiDimensionTargetConfigurer.kt
@@ -1,10 +1,22 @@
+@file:OptIn(ExternalKotlinTargetApi::class)
+
package co.touchlab.skie.gradle.version.target
+import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Project
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.namedDomainObjectList
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
+// import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.createExternalKotlinTarget
class MultiDimensionTargetConfigurer(
private val project: Project,
@@ -33,8 +45,32 @@ class MultiDimensionTargetConfigurer(
}
val kotlin = project.extensions.getByType()
+// val target = kotlin.createExternalKotlinTarget {
+// this.configureIdeImport {
+// registerImportAction {
+// println("Runinng ide import")
+// }
+// }
+// }
allTargets.forEach { target ->
kotlin.createTarget(target)
}
}
}
+
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
+class MyExternalTarget(delegate: DecoratedExternalKotlinTarget.Delegate): DecoratedExternalKotlinTarget(delegate) /*, HasConfigurableKotlinCompilerOptions */
+{
+ val myCustomProperty: String = "hello there"
+
+ override val compilations: NamedDomainObjectContainer
+ get() = super.compilations as NamedDomainObjectContainer
+
+// @ExperimentalKotlinGradlePluginApi
+// override val compilerOptions: KotlinJvmCompilerOptions
+// get() = super.compilerOptions as KotlinJvmCompilerOptions
+}
+
+class MyCustomCompilation(delegate: DecoratedExternalKotlinCompilation.Delegate): DecoratedExternalKotlinCompilation(delegate) {
+ val anotherCustomProperty: String = "hello world"
+}
diff --git a/common-gradle/gradle/libs.versions.toml b/common-gradle/gradle/libs.versions.toml
index 6115ef115..414649cb7 100644
--- a/common-gradle/gradle/libs.versions.toml
+++ b/common-gradle/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
[versions]
java = "11"
-kotlin = "1.8.21"
+kotlin = "2.0.0"
pluginPublish = "1.2.0"
kotest = "5.8.0"
buildconfig = "4.1.1"
diff --git a/common-gradle/gradle/wrapper/gradle-wrapper.properties b/common-gradle/gradle/wrapper/gradle-wrapper.properties
index baede7812..253bd1289 100644
--- a/common-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/common-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
# Update also libs.versions.toml
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/dev-support/pure-compiler/framework/build.gradle.kts b/dev-support/pure-compiler/framework/build.gradle.kts
index 568f47e4b..daef3512e 100644
--- a/dev-support/pure-compiler/framework/build.gradle.kts
+++ b/dev-support/pure-compiler/framework/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
targets.withType {
binaries {
framework {
- isStatic = true
+ isStatic = false
baseName = "Kotlin"
freeCompilerArgs = freeCompilerArgs + listOf("-Xbinary=bundleId=Kotlin")
diff --git a/dev-support/pure-compiler/framework/src/commonMain/kotlin/EmptyFile.kt b/dev-support/pure-compiler/framework/src/commonMain/kotlin/EmptyFile.kt
index 8b1378917..b111ecf35 100644
--- a/dev-support/pure-compiler/framework/src/commonMain/kotlin/EmptyFile.kt
+++ b/dev-support/pure-compiler/framework/src/commonMain/kotlin/EmptyFile.kt
@@ -1 +1,4 @@
+fun kmpTest(): String {
+ return "Helloworld"
+}
diff --git a/dev-support/skie/ios/framework/build.gradle.kts b/dev-support/skie/ios/framework/build.gradle.kts
index 399119cc1..ef7a5532a 100644
--- a/dev-support/skie/ios/framework/build.gradle.kts
+++ b/dev-support/skie/ios/framework/build.gradle.kts
@@ -88,6 +88,7 @@ kotlin {
iosArm64()
iosX64()
iosSimulatorArm64()
+ watchosDeviceArm64()
// val exportedLibraries = performanceBenchmarkLibraries
val exportedLibraries = listOf(
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt
index 31e9f2fda..c5f7e2512 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/base/BaseGradleTests.kt
@@ -76,7 +76,7 @@ abstract class BaseGradleTests: TestUtilsTrait, GradleBuildFileBuilderTrait {
.apply {
withProjectDir(testProjectDir)
withGradleVersion(gradleVersion)
- withArguments(*arguments, "--stacktrace")
+ withArguments(*arguments, "--stacktrace", "--info")
if (!isCI) {
forwardOutput()
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt
index 3fc0678fc..bf8c35623 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests.kt
@@ -24,6 +24,8 @@ class KotlinArtifactDsl_Framework_AllDarwinTargetsAllFrameworkArtifactsTests: Ba
rootBuildFile(kotlinVersion) {
kotlin {
allDarwin()
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt
index 21739516c..999cef946 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests.kt
@@ -24,6 +24,8 @@ class KotlinArtifactDsl_Framework_AllDarwinTargetsSingleFrameworkArtifactTests:
rootBuildFile(kotlinVersion) {
kotlin {
allDarwin()
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt
index 143fbf6fc..09a65ccf2 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_Framework_SingleTargetTests.kt
@@ -24,6 +24,8 @@ class KotlinArtifactDsl_Framework_SingleTargetTests: BaseGradleTests() {
rootBuildFile(kotlinVersion) {
kotlin {
target(target)
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt
index b1cf6aa99..2a59af4e9 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests.kt
@@ -40,6 +40,8 @@ class KotlinArtifactDsl_UniversalFramework_AllDarwinTargetsTests: BaseGradleTest
rootBuildFile(kotlinVersion) {
kotlin {
allDarwin()
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt
index 59a2193f6..bae402b99 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_UniversalFramework_SingleTargetTests.kt
@@ -24,6 +24,8 @@ class KotlinArtifactDsl_UniversalFramework_SingleTargetTests: BaseGradleTests()
rootBuildFile(kotlinVersion) {
kotlin {
target(target)
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt
index dd15bc384..7ecc7d147 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests.kt
@@ -23,6 +23,8 @@ class KotlinArtifactDsl_XCFramework_AllDarwinTargetsTests: BaseGradleTests() {
rootBuildFile(kotlinVersion) {
kotlin {
allDarwin()
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt
index 4476cc6ce..92cd77566 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinArtifactDsl_XCFramework_SingleTargetTests.kt
@@ -24,6 +24,8 @@ class KotlinArtifactDsl_XCFramework_SingleTargetTests: BaseGradleTests() {
rootBuildFile(kotlinVersion) {
kotlin {
target(target)
+
+ includeCoroutinesDependency()
}
kotlinArtifacts {
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt
index 701cd168d..6b277977b 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_AllDarwinPresetsTests.kt
@@ -24,6 +24,8 @@ class KotlinBinaryDsl_Framework_AllDarwinPresetsTests: BaseGradleTests() {
kotlin {
targets(KotlinTarget.Native.Darwin)
+ includeCoroutinesDependency()
+
registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode)
}
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt
index ac11d58f9..0123441ca 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SinglePresetTests.kt
@@ -25,6 +25,8 @@ class KotlinBinaryDsl_Framework_SinglePresetTests: BaseGradleTests() {
kotlin {
targets(preset)
+ includeCoroutinesDependency()
+
registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode)
}
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt
index e316b79dd..6b88ab7a5 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_Framework_SingleTargetTests.kt
@@ -25,6 +25,8 @@ class KotlinBinaryDsl_Framework_SingleTargetTests: BaseGradleTests() {
kotlin {
target(target)
+ includeCoroutinesDependency()
+
registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode)
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_XCFramework_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_XCFramework_SingleTargetTests.kt
index cd3f8977c..949960fb1 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_XCFramework_SingleTargetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/KotlinBinaryDsl_XCFramework_SingleTargetTests.kt
@@ -27,6 +27,8 @@ class KotlinBinaryDsl_XCFramework_SingleTargetTests: BaseGradleTests() {
kotlin {
target(target)
+ includeCoroutinesDependency()
+
registerNativeFrameworks(kotlinVersion, buildConfiguration, linkMode, includeXcframework = true)
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt
index 364f7b327..b6019365c 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_AllDarwinTargetsTests.kt
@@ -15,6 +15,8 @@ class NoArtifact_AllDarwinTargetsTests: BaseGradleTests() {
rootBuildFile(kotlinVersion) {
kotlin {
allDarwin()
+
+ includeCoroutinesDependency()
}
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt
index 0bbb6f849..04fff57cf 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/basic/NoArtifact_SingleTargetTests.kt
@@ -19,6 +19,8 @@ class NoArtifact_SingleTargetTests: BaseGradleTests() {
rootBuildFile(kotlinVersion) {
kotlin {
target(kotlinTarget)
+
+ includeCoroutinesDependency()
}
}
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt
index 69acf24a3..bf7819648 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/suite/gradle/configurationcache/GradleConfigurationCacheTests.kt
@@ -55,6 +55,8 @@ class GradleConfigurationCacheTests: BaseGradleTests() {
kotlin {
targets(KotlinTarget.Native)
+ includeCoroutinesDependency()
+
registerNativeFrameworks(
kotlinVersion = kotlinVersion,
buildConfiguration = configuration,
diff --git a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt
index 980fb2e3d..792ffb089 100644
--- a/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt
+++ b/test-runner/src/test/kotlin/co/touchlab/skie/test/trait/gradle/BuildGradleBuilder.kt
@@ -123,7 +123,6 @@ class BuildGradleBuilder(
allIos()
allMacos()
allTvos()
- // TODO: allTvos()
// TODO: allWatchos()
}
@@ -140,6 +139,14 @@ class BuildGradleBuilder(
fun target(target: KotlinTarget) = +"${target.id}()"
+ fun includeCoroutinesDependency() {
+ "sourceSets.commonMain" {
+ "dependencies" {
+ +"""implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")"""
+ }
+ }
+ }
+
fun registerNativeFrameworks(
kotlinVersion: KotlinVersion,
buildConfiguration: BuildConfiguration,