Merge branch 'master' into feat/appimage-updater

Author: derspotter

.github/workflows/linux-appimage.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Upload AppImage artifact
         id: upload-appimage
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: nextcloud-appimage-pr-${{ github.event.number }}
           path: ${{ steps.build-appimage.outputs.APPIMAGE_NAME }}

.github/workflows/macos-build-and-test.yml

@@ -26,18 +26,20 @@ jobs:
   build:
     name: Build nextcloud-client
     timeout-minutes: 60
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           fetch-depth: 1
 
-      - name: List Xcode installations
-        run: sudo ls -1 /Applications | grep "Xcode"
-
-      - name: Select Xcode 16.3
-        run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
-
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+      
+      - name: Show Swift version
+        run: swift --version
+      
       - name: Set up Python ${{ inputs.PYTHON_VERSION }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
@@ -48,7 +50,7 @@ jobs:
           brew install homebrew/cask/inkscape
 
       - name: Restore cached Craft directories
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: |
             ${{ inputs.CRAFT_MASTER_LOCATION }}
@@ -61,7 +63,7 @@ jobs:
           python "${{ inputs.CRAFT_MASTER_LOCATION }}/CraftMaster.py" --config "${{ inputs.CRAFT_MASTER_CONFIG }}" --target ${{ inputs.CRAFT_TARGET }} -c --options nextcloud-client.srcDir=${{ github.workspace }} --options nextcloud-client.buildFileProviderModule=${{ inputs.buildFileProviderModule }} nextcloud-client
 
       - name: Cache Craft directories containing the built client
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: |
             ${{ inputs.CRAFT_MASTER_LOCATION }}
@@ -74,10 +76,10 @@ jobs:
     name: Run tests
     needs: build
     timeout-minutes: 60
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
       - name: Restore cached Craft directories containing the built client
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: |
             ${{ inputs.CRAFT_MASTER_LOCATION }}

.github/workflows/macos-craft-ci.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Discover cached Craft directories
         id: cache-craft-restore
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: |
             ${{ env.CRAFT_MASTER_LOCATION }}
@@ -81,7 +81,7 @@ jobs:
 
       - name: Cache Craft directories
         if: steps.cache-craft-restore.outputs.cache-hit != 'true'
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: |
             ${{ env.CRAFT_MASTER_LOCATION }}

.github/workflows/nextcloudfileproviderkit.yml

@@ -0,0 +1,42 @@
+# SPDX-FileCopyrightText: Nextcloud GmbH
+# SPDX-FileCopyrightText: 2025 Iva Horn
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+name: NextcloudFileProviderKit
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  Lint:
+    runs-on: macos-latest
+
+    defaults:
+      run:
+        working-directory: shell_integration/MacOSX/NextcloudFileProviderKit
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: SwiftFormat
+        run: swiftformat --lint . --reporter github-actions-log
+
+  Tests:
+    runs-on: macos-latest
+
+    defaults:
+      run:
+        working-directory: shell_integration/MacOSX/NextcloudFileProviderKit
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+
+    - name: Run Tests
+      run: xcodebuild clean build test -scheme NextcloudFileProviderKit -destination "platform=macOS,name=My Mac"

.github/workflows/sonarcloud.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Restore cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: /cache
           key: ${{ runner.os }}

.github/workflows/windows-build-and-test.yml

@@ -38,7 +38,7 @@ jobs:
           
       - name: Cache Install OpenCppCoverage
         id: cache-install-opencppcoverage
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
         with:
           path: C:\Program Files\OpenCppCoverage
           key: ${{ runner.os }}-cache-install-opencppcoverage
@@ -51,7 +51,7 @@ jobs:
 
       #- name: Cache Install inkscape
       #  id: cache-install-inkscape
-      #  uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      #  uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       #  with:
       #    path: C:\Program Files\inkscape
       #    key: ${{ runner.os }}-cache-install-inkscape

CMakeLists.txt

@@ -237,10 +237,6 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
     add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()
 
-if(APPLE)
-  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
-endif()
-
 if(BUILD_CLIENT)
     OPTION(GUI_TESTING "Build with gui introspection features of socket api" OFF)
 

NEXTCLOUD.cmake

@@ -31,6 +31,7 @@ set( APPLICATION_ICON_SET   "SVG" )
 set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" )
 set( APPLICATION_SERVER_URL_ENFORCE ON ) # If set and APPLICATION_SERVER_URL is defined, the server can only connect to the pre-defined URL
 set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
+set( DEVELOPMENT_TEAM "NKUJUXUJ3B" CACHE STRING "Apple Development Team ID for code signing" )
 set( APPLICATION_VIRTUALFILE_SUFFIX "nextcloud" CACHE STRING "Virtual file suffix (not including the .)")
 set( APPLICATION_OCSP_STAPLING_ENABLED OFF )
 set( APPLICATION_FORBID_BAD_SSL OFF )

REUSE.toml

@@ -31,6 +31,7 @@ SPDX-License-Identifier = "GPL-2.0-or-later"
 
 [[annotations]]
 path = [
+    "admin/osx/container-migration.plist.cmake",
     "admin/osx/TransifexStringCatalogSanitizer/Package.swift",
     "admin/osx/TransifexStringCatalogSanitizer/Package.resolved",
     "admin/osx/TransifexStringCatalogSanitizer/README.md",

admin/osx/CMakeLists.txt

@@ -21,6 +21,11 @@ else()
     set(DEBUG_ENTITLEMENTS "")
 endif()
 
+# Sandbox migration description
+configure_file(container-migration.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/container-migration.plist @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/admin/osx/container-migration.plist
+        DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources)
+
 configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.entitlements.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.entitlements)
 configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)