Make polished

Author: aplteam

APLSource/Admin/Make.aplf

@@ -1,15 +1,16 @@
- Make flag;M;C;path;zipFilename;res;version;cfg;parms
-:If flag
-    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
-    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
+ Make flag;M;C;path;zipFilename;res;version;cfg;parms;cfgFilename
+ :If flag
+     M←⎕SE.MakeHelpers
+     C←##.CiderConfig
+     path←C.HOME,'/',C.CIDER.distributionFolder
+     cfgFilename←C.HOME,'/apl-package.json'
+     cfg←⎕JSON⍠('Dialect' 'JSON5')⊢⊃⎕NGET cfgFilename
+     cfgFilename M.EditVersion cfg
+     M.RecreateFolder path
+     parms←⎕SE.Tatin.CreateBuildParms C.HOME
+     parms.targetPath←path
+     parms.version←{⍵↑⍨¯1+⍵⍳'+'}##.GitHubAPIv3.Version
+     zipFilename←⎕SE.Tatin.BuildPackage parms
+     ⎕←'*** New version build successfully:',M.CR,'   ',zipFilename
+ :EndIf
 ⍝Done

APLSource/GitHubAPIv3.aplc

@@ -10,11 +10,23 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←'GitHubAPIv3' '1.5.0' '2024-11-16'
+    ⍝ Returns the version number from TatinVars
+    ⍝ See also `History`
+      r←''
+      :If 0<##.⎕NC'TatinVars.CONFIG'
+          r←(⎕JSON⍠('Dialect' 'JSON5')⊢##.TatinVars.CONFIG).version
+      :Else
+          ⍝ When a script is not loaded with Tatin, there will be no namespace `TatinVars`.
+          ⍝ In such cases we cannot provide a version number, so we return an empty char vector
+          r←''
+      :EndIf
     ∇
 
     ∇ History
       :Access Public Shared
+    ⍝ * 1.6.0 from 2025-01-025
+    ⍝   * CommTools removed as a dependency - it was only required for tests
+    ⍝   * `Version` now returns the package config file setting
     ⍝ * 1.5.0 from 2024-11-16
     ⍝   * `CheckForUpdate` can now handle beta versions on the client side (on GitHub, betas are not supported)
     ⍝ * 1.4.0 from 2024-09-24
@@ -300,7 +312,7 @@
     ⍝ * The better version number\\
     ⍝ If the given version is a beta version (say 1.2.3-beta-1) and on GitHub it is 1.2.3 then the GitHub version
     ⍝ is considered to be a later version. \\
-    ⍝ If the latest verson on GitHub is a beta an erroris thrown: this is not supported. 
+    ⍝ If the latest verson on GitHub is a beta an erroris thrown: this is not supported.
       :Access Public Instance
       betterVersion←''
       gitVersion_←GetLatestTag repoName

apl-package.json

@@ -19,5 +19,5 @@
   source: "APLSource/GitHubAPIv3.aplc",
   tags: "github-utilities",
   userCommandScript: "",
-  version: "1.5.0+53",
+  version: "1.5.0+55",
 }

packages/apl-buildlist.json

@@ -1,17 +1,14 @@
 {
   packageID: [
     "dyalog-HttpCommand-5.8.0",
-    "aplteam-CommTools-2.0.1",
     "aplteam-APLTreeUtils2-1.4.1",
   ],
   principal: [
     1,
     1,
-    1,
   ],
   url: [
     "https://tatin.dev/",
     "https://tatin.dev/",
-    "https://tatin.dev/",
   ],
 }

packages/apl-dependencies.txt

@@ -1,3 +1,2 @@
 aplteam-APLTreeUtils2-1.4.1
 dyalog-HttpCommand-5.8.0
-aplteam-CommTools-2.0.1