Merge branch 'master' into feature/graphapi-update

.github/workflows/build-and-analyze.yml

@@ -1,31 +1,25 @@
-name: Build and Analyze
+name: Build Xcode project
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 jobs:
   build:
-    name: Build and analyse default scheme using xcodebuild command
-    runs-on: macos-latest
+    name: Build Xcode project
+    runs-on: macos-15
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set Default Scheme
-        run: |
-          scheme_list=$(xcodebuild -list -json | tr -d "\n")
-          default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]")
-          echo $default | cat >default
-          echo Using default scheme: $default
-      - name: Build
-        env:
-          scheme: ${{ 'default' }}
-        run: |
-          if [ $scheme = default ]; then scheme=$(cat default); fi
-          if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
-          file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
-          xcodebuild clean build analyze -scheme "$scheme" -"$filetype_parameter" "$file_to_build" | xcpretty && exit ${PIPESTATUS[0]}
-
+        with:
+          submodules: true
+      - name: mxcl/Xcodebuild
+        uses: mxcl/[email protected]
+        with:
+          scheme: ownCloudSDK
+          action: build
+          platform: iOS
+          platform-version: 18.2

.github/workflows/pull-transifex.yml

@@ -25,12 +25,23 @@ jobs:
         shell: bash
         run: |
           beautifyJSON() {
-            jq --sort-keys 'walk(if type == "object" then del(."th_TH", ."pt_PT", ."pt_BR", ."nn_NO", ."nb_NO", ."en_GB") else . end)' $1 >$1.tmp
-            mv $1.tmp $1
+            jq --sort-keys 'walk(if type == "object" then del(."th_TH", ."pt_PT", ."pt_BR", ."nn_NO", ."nb_NO", ."en_GB") else . end)' "$1" >"$1.tmp"
+            mv "$1.tmp" "$1"
           }
           beautifyJSON "ownCloudSDK/Resources/Localizable.xcstrings"
           beautifyJSON "ownCloudUI/Resources/Localizable.xcstrings"         
 
+      - name: Setup Swift
+        uses: swift-actions/[email protected]
+
+      - name: Build ocstringstool
+        run: |
+         swift -v
+         swiftc tools/ocstringstool/ocstringstool/main.swift -o /tmp/ocstringstool
+
+      - name: Run ocstringstool
+        run: /tmp/ocstringstool normalize "ownCloudSDK/Resources" "ownCloudUI/Resources"
+
       - uses: GuillaumeFalourd/[email protected]
         with:
           email: [email protected]