Merge branch 'release/1.0.0' into 'master'

Release 1.0.0

See merge request madd/ios/stratoionos/easy-storage!54

Author: vtolkach

.github/workflows/additional-targets.yml

@@ -27,17 +27,6 @@ jobs:
     - name: Set env var
       run: echo "DEVELOPER_DIR=$(xcode-select --print-path)" >> $GITHUB_ENV
     - uses: actions/checkout@v4
-    - name: Restore Carhage Cache
-      uses: actions/cache@v3
-      id: carthage-cache
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-carthage-
-    - name: Carthage
-      if: steps.carthage-cache.outputs.cache-hit != 'true'
-      run: carthage bootstrap --use-xcframeworks --platform iOS
     - name: Download GoogleService-Info.plist
       run: wget "https://raw.githubusercontent.com/firebase/quickstart-ios/master/mock-GoogleService-Info.plist" -O GoogleService-Info.plist
     - name: Build iOS Share

.github/workflows/xcode.yml

@@ -6,44 +6,35 @@ on:
       - master
       - develop
   pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+    types:
+      - synchronize
+      - opened
+      - reopened
+      - ready_for_review
     branches:
       - master
       - develop
 
 env:
   PROJECT: Nextcloud.xcodeproj
-  DESTINATION: platform=iOS Simulator,name=iPhone 15,OS=17.2
+  DESTINATION: platform=iOS Simulator,name=iPhone 16,OS=18.2
   SCHEME: Nextcloud
-  SERVER_BRANCH: stable28
-  PHP_VERSION: 8.2
+  SERVER_BRANCH: stable30
+  PHP_VERSION: 8.3
 
 jobs:
   build:
     name: Build
-    runs-on: macos-13
+    runs-on: macos-15
     if: github.event.pull_request.draft == false
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Restore Carhage Cache
-      uses: actions/cache@v3
-      id: carthage-cache
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-carthage-
-
-    - name: Carthage
-      if: steps.carthage-cache.outputs.cache-hit != 'true'
-      run: carthage bootstrap --use-xcframeworks --platform iOS
-
     - name: Download GoogleService-Info.plist
       run: wget "https://raw.githubusercontent.com/firebase/quickstart-ios/master/mock-GoogleService-Info.plist" -O GoogleService-Info.plist
 
-    - name: Build Nextcloud iOS
+    - name: Run Xcode Build
       run: |
         set -o pipefail && \
         xcodebuild build-for-testing \
@@ -52,43 +43,51 @@ jobs:
         -derivedDataPath "DerivedData" \
         | xcbeautify --quieter
 
-    - name: Upload test build
+    - name: Upload Build Products
       uses: actions/upload-artifact@v4
       with:
-        name: Nextcloud iOS
+        name: Nextcloud for iOS
         path: DerivedData/Build/Products
         retention-days: 4
 
   test:
-    name: Test
-    runs-on: macos-13
+    name: Run Tests
+    runs-on: macos-15
     needs: [build]
 
-    if: github.event.pull_request.draft == false
+    # Temporarily, project has no effective tests except UI tests which are unfeasible on virtualized GitHub runners (see #3291)
+    # Previously: github.event.pull_request.draft == false
+    if: false
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up php ${{ env.PHP_VERSION }}
-      uses: shivammathur/setup-php@8872c784b04a1420e81191df5d64fbd59d3d3033 # v2.30.0
+    - name: Prepare PHP ${{ env.PHP_VERSION }}
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ env.PHP_VERSION }}
         # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
         extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql
         coverage: none
         ini-file: development
-        # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on
         ini-values: apc.enable_cli=on, disable_functions=
 
-    - name: Checkout server
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - name: Checkout Nextcloud Server
+      uses: actions/checkout@v4
       with:
         submodules: true
         repository: nextcloud/server
         path: server
         ref: ${{ env.SERVER_BRANCH }}
 
-    - name: Set up Nextcloud
+    - name: Checkout Download Limits App
+      uses: actions/checkout@v4
+      with:
+        repository: nextcloud/files_downloadlimit
+        path: server/apps/files_downloadlimit
+        ref: ${{ env.SERVER_BRANCH }}
+
+    - name: Install Nextcloud Server
       run: |
         mkdir server/data
         ./server/occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
@@ -97,18 +96,33 @@ jobs:
         ./server/occ config:system:set ratelimit.protection.enabled --value false --type bool
         ./server/occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
         ./server/occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
+        ./server/occ app:enable files_downloadlimit
         ./server/occ background:cron
         PHP_CLI_SERVER_WORKERS=5 php -S localhost:8080 -t server/ &
 
-    - name: Download test build
+    - name: Download Build
       uses: actions/download-artifact@v4
       with:
-        name: Nextcloud iOS
+        name: Nextcloud for iOS
 
-    - name: Check server status
+    - name: Assert Nextcloud Server Status
       run: curl -s --retry 5 --retry-delay 60 --retry-all-errors http://localhost:8080/status.php || true
 
-    - name: Test Nextcloud iOS
+    - name: Boot iOS Simulator
+      run: |
+        xcrun simctl boot "iPhone 16"
+        xcrun simctl bootstatus "iPhone 16" || echo "Simulator booted"
+
+    - name: Check if Safari is installed
+      run: |
+        if xcrun simctl listapps booted | grep -q com.apple.mobilesafari; then
+          echo "Safari is installed in the simulator."
+        else
+          echo "Safari is NOT installed in the simulator."
+          exit 1
+        fi
+
+    - name: Run Xcode Test
       run: |
         set -o pipefail && \
         xcodebuild test-without-building \
@@ -117,13 +131,11 @@ jobs:
         -derivedDataPath "DerivedData" \
         -test-iterations 3 \
         -retry-tests-on-failure \
-        -resultBundlePath "TestResult.xcresult" \
-        | xcbeautify --quieter
+        -resultBundlePath "TestResult.xcresult"
 
-    - name: Upload test results
+    - name: Upload Xcode Test Results
       uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }}
       with:
         name: TestResult.xcresult
         path: "TestResult.xcresult"
-

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
   IPA_PATH: "${outputDirPath}/${scheme}.ipa"
   DSYM_PATH: "*.dSYM.zip"
   scheme: "Nextcloud"
-  dev_configuration: "Release"
+  dev_configuration: "Alpha"
   beta_configuration: "Beta"
   archive_path: "${outputDirPath}/${scheme}"
   export_method: "ad-hoc"
@@ -14,15 +14,12 @@ stages:
 
 .mac_general_scripts: &mac_general_scripts
   - security unlock-keychain -p $PASSWORD_BUILDE ~/Library/Keychains/login.keychain-db
-  - brew install carthage
   - brew install jq
+  - gem install fastlane --user-install
   - fastlane -v
   - xcodebuild -version
   - date
 
-.install_carthage_dependencies: &install_carthage_dependencies
-  - carthage update --use-xcframeworks --platform iOS
-
 .download_google_info_plist: &download_google_info_plist
   - curl 
     --fail 
@@ -65,15 +62,15 @@ stages:
     --clean
 
 .build_simulator_general_script: &build_simulator_general_script
-  - xcodebuild -configuration Debug -scheme $scheme -sdk iphonesimulator -derivedDataPath ./BuildForSimulator -quiet
+  - xcodebuild -configuration Alpha -scheme $scheme -sdk iphonesimulator -derivedDataPath ./BuildForSimulator -quiet
 
 ############## build ##############
 
 .build_general_params: &build_general_params
   retry: 1
   stage: build
   tags:
-    - xcode15
+    - xcode16
   before_script:
     - *mac_general_scripts
   artifacts:
@@ -85,7 +82,6 @@ stages:
 build_develop_feature:
   <<: *build_general_params
   script:
-    - *install_carthage_dependencies
     - *download_google_info_plist
     - *build_general_script
   only:
@@ -97,7 +93,6 @@ build_beta:
   <<: *build_general_params
   when: manual
   script:
-    - *install_carthage_dependencies
     - *download_google_info_plist_beta
     - *build_general_script_beta
   only:
@@ -109,7 +104,6 @@ build_simulator:
   <<: *build_general_params
   when: manual
   script:
-    - *install_carthage_dependencies
     - *download_google_info_plist
     - *build_simulator_general_script
     - zip -r ./${scheme}.zip ./BuildForSimulator/Build/Products/Debug-iphonesimulator/${scheme}.app

.swiftlint.yml

@@ -37,6 +37,7 @@ disabled_rules:
   - type_name
   - void_function_in_ternary
   - switch_case_alignment
+  - unavailable_condition
 excluded:
   - Carthage
   - Pods

AUTHORS

@@ -0,0 +1,10 @@
+<!--
+  - SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: GPL-3.0-or-later
+-->
+# Authors
+
+- Marino Faggiana <[email protected]>
+- Henrik Storch <[email protected]>
+- Milen Pivchev <[email protected]>
+- Philippe Weidmann <[email protected]>

AUTHORS.md

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.viseven.ionos.easystorage</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.viseven.ionos.easystorage</string>
+	</array>
+</dict>
+</plist>

Brand/Alpha/File_Provider_Extension.entitlements

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>HiDrive Next</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionFileProviderDocumentGroup</key>
+		<string>group.com.viseven.ionos.easystorage</string>
+		<key>NSExtensionFileProviderSupportsEnumeration</key>
+		<true/>
+		<key>NSExtensionFileProviderSupportsPickingFolders</key>
+		<true/>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.fileprovider-nonui</string>
+		<key>NSExtensionPrincipalClass</key>
+		<string>$(PRODUCT_MODULE_NAME).FileProviderExtension</string>
+	</dict>
+</dict>
+</plist>

Brand/Alpha/File_Provider_Extension.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.viseven.ionos.easystorage</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.viseven.ionos.easystorage</string>
+	</array>
+</dict>
+</plist>

Brand/Alpha/File_Provider_Extension_UI.entitlements

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>HiDrive Next</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionFileProviderActions</key>
+		<array>
+			<dict>
+				<key>NSExtensionFileProviderActionActivationRule</key>
+				<string>TRUEPREDICATE</string>
+				<key>NSExtensionFileProviderActionIdentifier</key>
+				<string>com.mycompany.FileProviderUI.CustomAction</string>
+				<key>NSExtensionFileProviderActionName</key>
+				<string>Custom Action</string>
+			</dict>
+		</array>
+		<key>NSExtensionMainStoryboard</key>
+		<string>MainInterface</string>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.fileprovider-actionsui</string>
+	</dict>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>