diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9e8573..9194ad5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,15 @@ 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: @@ -22,3 +26,4 @@ jobs: version: vcs build: official token: ${{ secrets.DLTK }} + diff --git a/Build/4DPop-Macros.dmg b/Build/4DPop-Macros.dmg index 1f9f18d..d09d399 100644 Binary files a/Build/4DPop-Macros.dmg and b/Build/4DPop-Macros.dmg differ diff --git a/Build/4DPop-Macros.zip b/Build/4DPop-Macros.zip index 240664c..a37ef1d 100644 Binary files a/Build/4DPop-Macros.zip and b/Build/4DPop-Macros.zip differ diff --git a/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ b/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ index 15ba379..4f2b793 100755 Binary files a/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ and b/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ differ diff --git a/Build/Components/4DPop Macros.4dbase/Info.plist b/Build/Components/4DPop Macros.4dbase/Info.plist index 2871d17..7e642b7 100755 --- a/Build/Components/4DPop Macros.4dbase/Info.plist +++ b/Build/Components/4DPop Macros.4dbase/Info.plist @@ -6,15 +6,15 @@ CFBundleName 4DPop Macros CFBundleVersion - 286 + 287 NSHumanReadableCopyright ©vdl 2009-2024 CFBundleGetInfoString - 20R6 + 20R7 CFBundleLongVersionString - 20R6 (285) + 20R7 (286) CFBundleShortVersionString - 20R6 + 20R7 CFBundleDisplayName 4DPop Macros diff --git a/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib index bcd9ae5..bcadcf8 100644 Binary files a/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib and b/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib differ diff --git a/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings index e3404ec..89224e8 100755 Binary files a/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings and b/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings differ diff --git a/Info.plist b/Info.plist index 2871d17..7e642b7 100755 --- a/Info.plist +++ b/Info.plist @@ -6,15 +6,15 @@ CFBundleName 4DPop Macros CFBundleVersion - 286 + 287 NSHumanReadableCopyright ©vdl 2009-2024 CFBundleGetInfoString - 20R6 + 20R7 CFBundleLongVersionString - 20R6 (285) + 20R7 (286) CFBundleShortVersionString - 20R6 + 20R7 CFBundleDisplayName 4DPop Macros diff --git a/Project/4DPop Macros.4DProject b/Project/4DPop Macros.4DProject index 6cd3bb4..2dd66e2 100755 --- a/Project/4DPop Macros.4DProject +++ b/Project/4DPop Macros.4DProject @@ -1,4 +1,4 @@ { "$comment": "The project file let you override the location for most folders", - "$4DPopAppMakerToolVersion": "20R6" + "$4DPopAppMakerToolVersion": "20R7" } \ No newline at end of file diff --git a/Project/Sources/Classes/beautifier.4dm b/Project/Sources/Classes/beautifier.4dm index 5276012..2f4271f 100644 --- a/Project/Sources/Classes/beautifier.4dm +++ b/Project/Sources/Classes/beautifier.4dm @@ -147,6 +147,20 @@ Function beautify() End if + // Mark:Use var instead of (_o_)C_xxx + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(604)+"\\(([^\\)]*)\\)").substitute("var \\1 : Blob") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(305)+"\\(([^\\)]*)\\)").substitute("var \\1 : Boolean") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1488)+"\\(([^\\)]*)\\)").substitute("var \\1 : Collection") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(307)+"\\(([^\\)]*)\\)").substitute("var \\1 : Date") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(283)+"\\(([^\\)]*)\\)").substitute("var \\1 : Integer") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1216)+"\\(([^\\)]*)\\)").substitute("var \\1 : Object") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(286)+"\\(([^\\)]*)\\)").substitute("var \\1 : Picture") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(301)+"\\(([^\\)]*)\\)").substitute("var \\1 : Pointer") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(285)+"\\(([^\\)]*)\\)").substitute("var \\1 : Real") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(284)+"\\(([^\\)]*)\\)").substitute("var \\1 : Text") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(306)+"\\(([^\\)]*)\\)").substitute("var \\1 : Time") + $code:=This:C1470.rgx.setTarget($code).setPattern("(?mi-s)"+Command name:C538(1683)+"\\(([^\\)]*)\\)").substitute("var \\1") + // Mark:Delete empty lines at the beginning of the method If (Bool:C1537($options.removeEmptyLinesAtTheBeginOfMethod)) diff --git a/Project/Sources/dependencies.json b/Project/Sources/dependencies.json index 23f5280..9e213d9 100644 --- a/Project/Sources/dependencies.json +++ b/Project/Sources/dependencies.json @@ -1,21 +1,68 @@ { "dependencies": { - "4DPop": {}, - "4DPop AppMaker": {}, - "4DPop Bookmarks": {}, - "4DPop Clipboard": {}, - "4DPop ColorChart": {}, - "4DPop Commands": {}, - "4DPop Constants Editor": {}, - "4DPop Git": {}, - "4DPop Image Buddy": {}, - "4DPop KeepIt": {}, - "4DPop Macros": {}, - "4DPop Pasteboard": {}, - "4DPop QuickOpen": {}, - "4DPop Rulers": {}, - "4DPop sqlSchemas": {}, - "4DPop Window": {}, - "4DPop XLIFF Pro": {} + "4DPop": { + "github": "vdelachaux/4DPop", + "version": "latest" + }, + "4DPop AppMaker": { + "github": "vdelachaux/4DPop-AppMaker", + "version": "latest" + }, + "4DPop Git": { + "github": "vdelachaux/4DPop-Git", + "version": "latest" + }, + "4DPop Macros": { + "github": "vdelachaux/4DPop-Macros", + "version": "latest" + }, + "4DPop QuickOpen": { + "github": "vdelachaux/4DPop-QuickOpen", + "version": "latest" + }, + "4DPop XLIFF Pro": { + "github": "vdelachaux/4DPop-XLIFF-Pro", + "version": "latest" + }, + "4DPop Bookmarks": { + "github": "vdelachaux/4DPop-Bookmarks", + "version": "latest" + }, + "4DPop ColorChart": { + "github": "vdelachaux/4DPop-ColorChart", + "version": "latest" + }, + "4DPop Commands": { + "github": "vdelachaux/4DPop-Commands", + "version": "latest" + }, + "4DPop Constants Editor": { + "github": "vdelachaux/4DPop-Constants-Editor", + "version": "latest" + }, + "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/Resources/InfoPlist.strings b/Resources/InfoPlist.strings index e3404ec..89224e8 100755 Binary files a/Resources/InfoPlist.strings and b/Resources/InfoPlist.strings differ