code cleanup

vdelachaux · Oct 2, 2024 · 7cc1cf6 · 7cc1cf6
1 parent 9ba5cc3
commit 7cc1cf6
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 58 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,15 +10,20 @@ on:
 
 jobs:
   build:
-    name: "Build"
-    runs-on: windows-latest
+    name: "Build on ${{ matrix.os }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Build
       uses: 4d/build4d-action@main
       with:
         product-line: vcs
         version: vcs
         build: official
         token: ${{ secrets.DLTK }}
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,27 @@
+name: Release
+on: 
+  release:
+    types: [published]
+jobs:
+  publish:
+    name: Publish
+    runs-on: macos-latest
+    env:
+      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    permissions:
+      contents: write # for asset upload
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: BuildAndPackage
+        uses: 4d/build4d-action@main
+        with:
+            product-line: vcs
+            version: vcs
+            build: official
+            token: ${{ secrets.DLTK }}
+            actions: "build,pack,sign,archive"
+            sign-certificate: "Vincent de Lachaux (DYRKW64QA9)"
+      - name: Upload
+        run: |
+          gh release upload ${{github.event.release.tag_name}} build/4DPop-Image-Buddy.zip
diff --git a/Build/4DPop-Image-Buddy.dmg b/Build/4DPop-Image-Buddy.dmg
diff --git a/Build/4DPop-Image-Buddy.zip b/Build/4DPop-Image-Buddy.zip
diff --git a/Build/Components/4DPop Image Buddy.4dbase/4DPop Image Buddy.4DZ b/Build/Components/4DPop Image Buddy.4dbase/4DPop Image Buddy.4DZ
diff --git a/Build/Components/4DPop Image Buddy.4dbase/Info.plist b/Build/Components/4DPop Image Buddy.4dbase/Info.plist
@@ -5,17 +5,17 @@
     <key>CFBundleName</key>
     <string>4DPop Image Buddy</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R6 (299)</string>
+    <string>20R7 (300)</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2007-2024</string>
     <key>CFBundleVersion</key>
-    <string>300</string>
+    <string>301</string>
     <key>CSResourcesFileMapped</key>
     <string></string>
     <key>CFBundleGetInfoString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Image Buddy</string>
   </dict>

diff --git a/Build/Components/4DPop Image Buddy.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Image Buddy.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Image Buddy.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Image Buddy.4dbase/Resources/InfoPlist.strings
diff --git a/Info.plist b/Info.plist
@@ -5,17 +5,17 @@
     <key>CFBundleName</key>
     <string>4DPop Image Buddy</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R6 (299)</string>
+    <string>20R7 (300)</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2007-2024</string>
     <key>CFBundleVersion</key>
-    <string>300</string>
+    <string>301</string>
     <key>CSResourcesFileMapped</key>
     <string></string>
     <key>CFBundleGetInfoString</key>
-    <string>20R6</string>
+    <string>20R7</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Image Buddy</string>
   </dict>

diff --git a/Project/4DPop Image Buddy.4DProject b/Project/4DPop Image Buddy.4DProject
@@ -1,5 +1,5 @@
 {
 	"$comment": "The project file let you override the location for most folders",
 	"compatibilityVersion": 1850,
-	"$4DPopAppMakerToolVersion": "20R6"
+	"$4DPopAppMakerToolVersion": "20R7"
 }
diff --git a/Project/Sources/dependencies.json b/Project/Sources/dependencies.json
@@ -40,12 +40,29 @@
       "github": "vdelachaux/4DPop-Constants-Editor",
       "version": "latest"
     },
-    "4DPop Image Buddy": {},
-    "4DPop KeepIt": {},
-    "4DPop Pasteboard": {},
-    "4DPop Rulers": {},
-    "4DPop sqlSchemas": {},
-    "4DPop Window": {},
-    "4DPop Clipboard": {}
+    "4DPop Image Buddy": {
+      "github": "vdelachaux/4DPop-Image-Buddy",
+      "version": "latest"
+    },
+    "4DPop KeepIt": {
+      "github": "vdelachaux/4DPop-KeepIt",
+      "version": "latest"
+    },
+    "4DPop Pasteboard": {
+      "github": "vdelachaux/4DPop-Pasteboard",
+      "version": "latest"
+    },
+    "4DPop Rulers": {
+      "github": "vdelachaux/4DPop-Rulers",
+      "version": "latest"
+    },
+    "4DPop sqlSchemas": {
+      "github": "vdelachaux/4DPop-sqlSchemas",
+      "version": "latest"
+    },
+    "4DPop Window": {
+      "github": "vdelachaux/4DPop-Window",
+      "version": "latest"
+    }
   }
 }
diff --git a/Project/Sources/folders.json b/Project/Sources/folders.json
@@ -1,23 +1,9 @@
 {
-	"_o_": {},
-	"(00_dev)": {},
-	"(Component)": {
-		"groups": [
-			"(Private)"
-		]
-	},
-	"(Private)": {},
-	"(Public)": {},
-	"(Tools)": {},
 	"# 🚧 DEV": {
 		"methods": [
 			"00_test"
 		]
 	},
-	"#️⃣ API": {},
-	"♻️ LIBRAIRIES": {},
-	"⚙️ MACROS": {},
-	"👥 NAMESPACE": {},
 	"📦 COMPONENT": {
 		"methods": [
 			"BROWSER_FILL",
@@ -65,12 +51,5 @@
 			"onDrop"
 		]
 	},
-	"trash": {
-		"groups": [
-			"(00_dev)",
-			"(Component)",
-			"(Public)",
-			"(Tools)"
-		]
-	}
+	"trash": {}
 }
diff --git a/README.md b/README.md
@@ -1,23 +1,17 @@
-[code-shield]: https://img.shields.io/static/v1?label=language&message=4d&color=blue
-[code-url]: https://developer.4d.com/
-[license-url]: LICENSE
-[notarized]: https://img.shields.io/badge/notarized-blue
+<!-- MARKDOWN LINKS & IMAGES -->
+[release-shield]: https://img.shields.io/github/v/release/vdelachaux/4DPop-Image-Buddy.svg?include_prereleases
+[release-url]: https://github.com/vdelachaux/4DPop-Image-Buddy.svg/releases/latest
 
-[code-top]: https://img.shields.io/github/languages/top/vdelachaux/4DPop-Image-Buddy.svg
-[code-size]: https://img.shields.io/github/languages/code-size/vdelachaux/4DPop-Image-Buddy.svg
-[release-shield]: https://img.shields.io/github/v/release/vdelachaux/4DPop-Image-Buddy?include_prereleases
-[release-url]: https://github.com/vdelachaux/4DPop-Image-Buddy/releases/latest
-[license-shield]: https://img.shields.io/github/license/vdelachaux/4DPop-Image-Buddy
-[build-shield]: https://github.com/vdelachaux/4DPop-Image-Buddy/actions/workflows/build.yml/badge.svg
-[build-url]: https://github.com/vdelachaux/4DPop-Image-Buddy/actions/workflows/build.yml
+[license-shield]: https://img.shields.io/github/license/vdelachaux/4DPop-Image-Buddy.svg
 
-[![language][code-shield]][code-url]
-[![language-top][code-top]][code-url]
-![code-size][code-size]
-[![license][license-shield]][license-url]
+<!--BADGES-->
+![Static Badge](https://img.shields.io/badge/Dev%20Component-blue?logo=4d&link=https%3A%2F%2Fdeveloper.4d.com)
+![Static Badge](https://img.shields.io/badge/Project%20Dependencies-blue?logo=4d&link=https%3A%2F%2Fdeveloper.4d.com%2Fdocs%2FProject%2Fcomponents%2F%23loading-components)
+<br>
 [![release][release-shield]][release-url]
-[![build][build-shield]][license-url]
-![notarized][notarized]
+[![license][license-shield]](LICENSE)
+<br>
+<img src="https://img.shields.io/github/downloads/vdelachaux/4DPop-Image-Buddy/total"/>
 
 # 4DPop Image Buddy
 

diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings