abrudz · aplteam · Nov 22, 2024 · Nov 22, 2024 · Nov 22, 2024 · Nov 22, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,10 @@
+aplcore
+CONTINUE.dws
+conga.crash
+/packages/*
+!/packages/apl-dependencies.txt
+!/packages/apl-buildlist.json
+/packages_dev/*
+!/packages_dev/apl-dependencies.txt
+!/packages_dev/apl-buildlist.json
+/Dist/
diff --git a/APLSource/.linkconfig b/APLSource/.linkconfig
@@ -1 +1 @@
-{  LinkVersion: { ID: "4.0.20"},  Settings: {    arrays: 1,  },}
+{  LinkVersion: { ID: "4.0.17"},  Settings: {    arrays: 1,  },}

diff --git a/APLSource/Admin/Make.aplf b/APLSource/Admin/Make.aplf
@@ -0,0 +1,22 @@
+ Make flag;M;C;path;zipFilename;res;version;cfg;parms
+⍝ "Make" a new version of this project
+ :If flag
+     :If 0=⎕SE.⎕NC'MakeHelpers'
+         ⎕←'Loading package "MakeHelpers" into ⎕SE...'
+         {}⎕SE.Tatin.LoadPackages'[tatin]aplteam-MakeHelpers'⎕SE
+         ⎕←'   Done!'
+     :EndIf
+     M←⎕SE.MakeHelpers
+     C←##.CiderConfig
+     path←C.HOME,'/',C.CIDER.distributionFolder
+     cfg←⎕JSON⍠('Dialect' 'JSON5')⊢⊃⎕NGET C.HOME,'/apl-package.json'
+     version←M.CompileVersionNumberPattern cfg
+     M.RecreateFolder path
+     {}⎕SE.Tatin.CreateAPIfromCFG ##.Sort cfg
+     parms←⎕SE.Tatin.CreateBuildParms C.HOME
+     parms.targetPath←path
+     parms.version←version
+     zipFilename←⎕SE.Tatin.BuildPackage parms
+     ⎕←'*** New version build successfully:',M.CR,'   ',zipFilename
+ :EndIf
+⍝Done
diff --git a/APLSource/Sort/API/Classic.aplo b/APLSource/Sort/API/Classic.aplo
@@ -0,0 +1 @@
+Classic←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Classic) ⍵}
diff --git a/APLSource/Sort/API/Danish.aplo b/APLSource/Sort/API/Danish.aplo
@@ -0,0 +1 @@
+Danish←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Danish) ⍵}
diff --git a/APLSource/Sort/API/Finnish.aplo b/APLSource/Sort/API/Finnish.aplo
@@ -0,0 +1 @@
+Finnish←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Finnish) ⍵}
diff --git a/APLSource/Sort/API/German.aplo b/APLSource/Sort/API/German.aplo
@@ -0,0 +1 @@
+German←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.German) ⍵}
diff --git a/APLSource/Sort/API/Natural.aplo b/APLSource/Sort/API/Natural.aplo
@@ -0,0 +1 @@
+Natural←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Natural) ⍵}
diff --git a/APLSource/AtUE.aplo → APLSource/Sort/AtUE.aplo b/APLSource/AtUE.aplo → APLSource/Sort/AtUE.aplo
diff --git a/APLSource/Classic.aplo → APLSource/Sort/Classic.aplo b/APLSource/Classic.aplo → APLSource/Sort/Classic.aplo
diff --git a/APLSource/Danish.aplo → APLSource/Sort/Danish.aplo b/APLSource/Danish.aplo → APLSource/Sort/Danish.aplo
diff --git a/APLSource/ExpLigs.aplo → APLSource/Sort/ExpLigs.aplo b/APLSource/ExpLigs.aplo → APLSource/Sort/ExpLigs.aplo
diff --git a/APLSource/Finnish.aplo → APLSource/Sort/Finnish.aplo b/APLSource/Finnish.aplo → APLSource/Sort/Finnish.aplo
diff --git a/APLSource/Full.aplf → APLSource/Sort/Full.aplf b/APLSource/Full.aplf → APLSource/Sort/Full.aplf
diff --git a/APLSource/German.aplo → APLSource/Sort/German.aplo b/APLSource/German.aplo → APLSource/Sort/German.aplo
diff --git a/APLSource/IsSp.aplf → APLSource/Sort/IsSp.aplf b/APLSource/IsSp.aplf → APLSource/Sort/IsSp.aplf
diff --git a/APLSource/LoUp.aplf → APLSource/Sort/LoUp.aplf b/APLSource/LoUp.aplf → APLSource/Sort/LoUp.aplf
diff --git a/APLSource/Mix.aplf → APLSource/Sort/Mix.aplf b/APLSource/Mix.aplf → APLSource/Sort/Mix.aplf
diff --git a/APLSource/Natural.aplo → APLSource/Sort/Natural.aplo b/APLSource/Natural.aplo → APLSource/Sort/Natural.aplo
diff --git a/APLSource/Sort/Public.aplf b/APLSource/Sort/Public.aplf
@@ -0,0 +1,2 @@
+ r←Public
+ r←'Classic' 'Natural' 'Danish' 'Finnish' 'German'
diff --git a/APLSource/Sort.aplo → APLSource/Sort/Sort.aplo b/APLSource/Sort.aplo → APLSource/Sort/Sort.aplo
diff --git a/APLSource/Under.aplo → APLSource/Sort/Under.aplo b/APLSource/Under.aplo → APLSource/Sort/Under.aplo
diff --git a/APLSource/VariantsOf.aplo → APLSource/Sort/VariantsOf.aplo b/APLSource/VariantsOf.aplo → APLSource/Sort/VariantsOf.aplo
diff --git a/APLSource/last.apla → APLSource/Sort/last.apla b/APLSource/last.apla → APLSource/Sort/last.apla
diff --git a/APLSource/spaces.apla → APLSource/Sort/spaces.apla b/APLSource/spaces.apla → APLSource/Sort/spaces.apla
diff --git a/APLSource/zero.apla → APLSource/Sort/zero.apla b/APLSource/zero.apla → APLSource/Sort/zero.apla
diff --git a/apl-package.json b/apl-package.json
@@ -1,5 +1,5 @@
 {
-  api: "",
+  api: "API",
   assets: "",
   description: "Allow sorting according to various rules",
   documentation: "",
@@ -11,13 +11,13 @@
   maintainer: "a.brudz@gmail.com",
   minimumAplVersion: "18.0",
   ml: 1,
-  name: "sort",
+  name: "Sort",
   os_lin: 1,
   os_mac: 1,
   os_win: 1,
   project_url: "https://github.com/abrudz/sort",
-  source: "APLSource",
+  source: "APLSource/Sort",
   tags: "sorting,natural-sort,language",
   userCommandScript: "",
-  version: "0.1.0+3",
+  version: "0.1.1+9",
 }
diff --git a/cider.config b/cider.config
@@ -1,22 +1,21 @@
 {
   CIDER: {
-    cider_version: "0.42.2",
+    cider_version: "0.44.0",
     dependencies: {
-      nuget: "nuget-dependencies",
-      tatin: "tatin-dependencies",
+      nuget: "",
+      tatin: "",
     },
     dependencies_dev: {
       tatin: "tatin-dependencies_dev",
     },
     distributionFolder: "Dist",
     init: "",
-    make: "",
+    make: "Admin.Make 1",
     parent: "#",
     projectSpace: "Sort",
     project_url: "",
     source: "APLSource",
     tests: "",
-    version: "",
   },
   LINK: {
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ LinkVersion: { ID: "4.0.20"}, Settings: { arrays: 1, },}
		{ LinkVersion: { ID: "4.0.17"}, Settings: { arrays: 1, },}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Classic←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Classic) ⍵}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Danish←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Danish) ⍵}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Finnish←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Finnish) ⍵}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		German←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.German) ⍵}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Natural←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Natural) ⍵}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		r←Public
		r←'Classic' 'Natural' 'Danish' 'Finnish' 'German'