Merge branch 'master' into #345

Author: serhii-londar

.github/workflows/build.yml

@@ -14,6 +14,9 @@ on:
     branches:
       - 'master'
 
+env:
+  XCODE_VERSION: '16.4'
+
 jobs:
   danger-swiftlint:
     name: Danger SwiftLint
@@ -38,16 +41,21 @@ jobs:
     name: PodLint
     needs: test
     runs-on: macos-15
+    timeout-minutes: 40
     if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v4
 
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: ${{ env.XCODE_VERSION }}
+
       - name: Install CocoaPods
         working-directory: Example
         run: pod install
 
       - name: Lint pod library
-        run: pod lib lint --skip-tests --platforms=macos,ios,tvos --allow-warnings
+        run: pod lib lint --skip-tests --platforms=macos,ios,tvos --allow-warnings --fail-fast
 
   spm-build:
     name: Build Swift Package
@@ -69,7 +77,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 16.0
+          xcode-version: ${{ env.XCODE_VERSION }}
 
       - name: Install xcbeautify
         run: brew install xcbeautify
@@ -94,7 +102,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 16.0
+          xcode-version: ${{ env.XCODE_VERSION }}
 
       - name: Build
         working-directory: Example
@@ -111,19 +119,35 @@ jobs:
     name: Test
     needs: build
     runs-on: macos-15
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
 
+      - name: Cache CocoaPods
+        uses: actions/cache@v4
+        with:
+          path: Tests/Pods
+          key: ${{ runner.os }}-pods-tests-${{ hashFiles('Tests/Podfile.lock') }}
+
+      - name: Cache Xcode Derived Data
+        uses: actions/cache@v4
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData
+          key: ${{ runner.os }}-xcode-derived-${{ hashFiles('Tests/**/*.swift', 'Tests/**/*.m', 'Tests/**/*.h') }}
+
       - name: Install CocoaPods
         working-directory: Tests
-        run: pod install
+        run: |
+          if [ ! -d "Pods" ]; then
+            pod install
+          fi
 
       - name: Install xcbeautify
         run: brew install xcbeautify
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 16.0
+          xcode-version: ${{ env.XCODE_VERSION }}
 
       - name: Tests
         working-directory: Tests

.github/workflows/publish.yml

@@ -5,6 +5,9 @@ on:
     types: [released]
   workflow_dispatch:
 
+env:
+  XCODE_VERSION: '16.4'
+
 jobs:
   publish:
     runs-on: macos-latest
@@ -13,6 +16,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: ${{ env.XCODE_VERSION }}
+
       - name: Install cocoapods
         run: gem install cocoapods
 

CrowdinSDK.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |spec|
   spec.name             = 'CrowdinSDK'
-  spec.version          = '1.12.1'
+  spec.version          = '1.12.2'
   spec.summary          = 'Crowdin iOS SDK delivers all new translations from Crowdin project to the application immediately'
 
   spec.description      = <<-DESC

Example/Podfile.lock

@@ -1,48 +1,48 @@
 PODS:
   - BaseAPI (0.2.2)
-  - CrowdinSDK (1.12.1):
-    - CrowdinSDK/Core (= 1.12.1)
-    - CrowdinSDK/CrowdinProvider (= 1.12.1)
-  - CrowdinSDK/Core (1.12.1):
+  - CrowdinSDK (1.12.2):
+    - CrowdinSDK/Core (= 1.12.2)
+    - CrowdinSDK/CrowdinProvider (= 1.12.2)
+  - CrowdinSDK/Core (1.12.2):
     - CrowdinSDK/CrowdinFileSystem
-  - CrowdinSDK/CrowdinAPI (1.12.1):
+  - CrowdinSDK/CrowdinAPI (1.12.2):
     - BaseAPI (~> 0.2.2)
     - CrowdinSDK/Core
-  - CrowdinSDK/CrowdinFileSystem (1.12.1)
-  - CrowdinSDK/CrowdinProvider (1.12.1):
+  - CrowdinSDK/CrowdinFileSystem (1.12.2)
+  - CrowdinSDK/CrowdinProvider (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinFileSystem
-  - CrowdinSDK/CrowdinXCTestScreenshots (1.12.1):
+  - CrowdinSDK/CrowdinXCTestScreenshots (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
     - CrowdinSDK/Screenshots
-  - CrowdinSDK/IntervalUpdate (1.12.1):
+  - CrowdinSDK/IntervalUpdate (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
-  - CrowdinSDK/LoginFeature (1.12.1):
+  - CrowdinSDK/LoginFeature (1.12.2):
     - BaseAPI (~> 0.2.2)
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
-  - CrowdinSDK/RealtimeUpdate (1.12.1):
+  - CrowdinSDK/RealtimeUpdate (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
     - CrowdinSDK/LoginFeature
     - Starscream (~> 4.0.4)
-  - CrowdinSDK/RefreshLocalization (1.12.1):
+  - CrowdinSDK/RefreshLocalization (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
-  - CrowdinSDK/Screenshots (1.12.1):
+  - CrowdinSDK/Screenshots (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
     - CrowdinSDK/LoginFeature
-  - CrowdinSDK/Settings (1.12.1):
+  - CrowdinSDK/Settings (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinProvider
@@ -80,7 +80,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BaseAPI: 7d1c79778a5c85f8e05f5e5c9d7f9be6474a53eb
-  CrowdinSDK: c181e34fb10d13a436be371ad5bc7bcb7b042318
+  CrowdinSDK: c27c02e2995fb58ffb65113b2c7bc03e67dea36f
   Realm: 490aad28f1360e58fc22256d5d686d3a36525346
   RealmSwift: f6a9b56d747bbdd7931de1835896c5f024b6898a
   Starscream: fb2c4510bebf908c62bd383bcf05e673720e91fd

ObjCExample/Podfile.lock

@@ -1,15 +1,15 @@
 PODS:
   - BaseAPI (0.2.2)
-  - CrowdinSDK (1.12.1):
-    - CrowdinSDK/Core (= 1.12.1)
-    - CrowdinSDK/CrowdinProvider (= 1.12.1)
-  - CrowdinSDK/Core (1.12.1):
+  - CrowdinSDK (1.12.2):
+    - CrowdinSDK/Core (= 1.12.2)
+    - CrowdinSDK/CrowdinProvider (= 1.12.2)
+  - CrowdinSDK/Core (1.12.2):
     - CrowdinSDK/CrowdinFileSystem
-  - CrowdinSDK/CrowdinAPI (1.12.1):
+  - CrowdinSDK/CrowdinAPI (1.12.2):
     - BaseAPI (~> 0.2.2)
     - CrowdinSDK/Core
-  - CrowdinSDK/CrowdinFileSystem (1.12.1)
-  - CrowdinSDK/CrowdinProvider (1.12.1):
+  - CrowdinSDK/CrowdinFileSystem (1.12.2)
+  - CrowdinSDK/CrowdinProvider (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinFileSystem
@@ -27,7 +27,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BaseAPI: 7d1c79778a5c85f8e05f5e5c9d7f9be6474a53eb
-  CrowdinSDK: c181e34fb10d13a436be371ad5bc7bcb7b042318
+  CrowdinSDK: c27c02e2995fb58ffb65113b2c7bc03e67dea36f
 
 PODFILE CHECKSUM: 530155f41b1d99b9cdd5bfd43d94fc0d9d7a9e49
 

Sources/CrowdinSDK/Providers/Crowdin/LocalizationDownloader/CrowdinLocalizationDownloader.swift

@@ -31,6 +31,8 @@ class CrowdinLocalizationDownloader: CrowdinDownloaderProtocol {
             guard let self = self else { return }
             if let files = files {
                 let xcstringsFiles = files.filter({ $0.isXcstrings })
+                // For xcstrings we need to parse existing files when localization is changed, otherwise we wont get localization strings from xcstrings files.
+                self.parseXCStrings(files: xcstringsFiles, for: localization)
                 let notXcstringsFiles = files.filter({ !$0.isXcstrings })
                 let notXcstringsFilesToDownload = notXcstringsFiles.filter { self.manifestManager.hasFileChanged(filePath: $0, localization: localization) }
                 let xcStringsFilesToDownlaod = xcstringsFiles.filter({ self.manifestManager.hasFileChanged(filePath: $0, localization: self.manifestManager.xcstringsLanguage) })
@@ -42,7 +44,7 @@ class CrowdinLocalizationDownloader: CrowdinDownloaderProtocol {
                                   xcstrings: filesToDownload.filter({ $0.isXcstrings }),
                                   with: hash, timestamp: timestamp, for: localization)
                 } else {
-                    self.completion?(nil, nil, nil)
+                    self.completion?(self.strings, self.plurals, self.errors)
                 }
             } else if let error = error {
                 self.lock.lock()
@@ -186,8 +188,20 @@ class CrowdinLocalizationDownloader: CrowdinDownloaderProtocol {
         }
         lock.unlock()
     }
+    
     func updateTimestamp(for localization: String, filePath: String, timestamp: TimeInterval) {
         manifestManager.fileTimestampStorage.updateTimestamp(for: localization, filePath: filePath, timestamp: timestamp)
         manifestManager.fileTimestampStorage.saveTimestamps()
     }
+    
+    private func parseXCStrings(files: [String], for localization: String) {
+        for xcstringsFile in files {
+            if let data = XCStringsStorage.getFile(path: xcstringsFile) {
+                let parsed = XcstringsParser.parse(data: data, localization: localization)
+                self.add(strings: parsed.strings)
+                self.add(plurals: parsed.plurals)
+                self.add(error: parsed.error)
+            }
+        }
+    }
 }

Sources/Tests/Core/RealLocalizationProviderTests.swift

@@ -31,6 +31,7 @@ class RealLocalizationProviderTests: XCTestCase {
 
     override func tearDown() {
         localizationProvider.deintegrate()
+        ManifestManager.clear()
     }
 
     func testInitialization() {

Tests/Podfile.lock

@@ -1,22 +1,22 @@
 PODS:
   - BaseAPI (0.2.2)
-  - CrowdinSDK (1.12.1):
-    - CrowdinSDK/Core (= 1.12.1)
-    - CrowdinSDK/CrowdinProvider (= 1.12.1)
-  - CrowdinSDK/Core (1.12.1):
+  - CrowdinSDK (1.12.2):
+    - CrowdinSDK/Core (= 1.12.2)
+    - CrowdinSDK/CrowdinProvider (= 1.12.2)
+  - CrowdinSDK/Core (1.12.2):
     - CrowdinSDK/CrowdinFileSystem
-  - CrowdinSDK/Core_Tests (1.12.1)
-  - CrowdinSDK/CrowdinAPI (1.12.1):
+  - CrowdinSDK/Core_Tests (1.12.2)
+  - CrowdinSDK/CrowdinAPI (1.12.2):
     - BaseAPI (~> 0.2.2)
     - CrowdinSDK/Core
-  - CrowdinSDK/CrowdinAPI_Tests (1.12.1)
-  - CrowdinSDK/CrowdinFileSystem (1.12.1)
-  - CrowdinSDK/CrowdinProvider (1.12.1):
+  - CrowdinSDK/CrowdinAPI_Tests (1.12.2)
+  - CrowdinSDK/CrowdinFileSystem (1.12.2)
+  - CrowdinSDK/CrowdinProvider (1.12.2):
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
     - CrowdinSDK/CrowdinFileSystem
-  - CrowdinSDK/CrowdinProvider_Tests (1.12.1)
-  - CrowdinSDK/LoginFeature (1.12.1):
+  - CrowdinSDK/CrowdinProvider_Tests (1.12.2)
+  - CrowdinSDK/LoginFeature (1.12.2):
     - BaseAPI (~> 0.2.2)
     - CrowdinSDK/Core
     - CrowdinSDK/CrowdinAPI
@@ -40,7 +40,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BaseAPI: 7d1c79778a5c85f8e05f5e5c9d7f9be6474a53eb
-  CrowdinSDK: c181e34fb10d13a436be371ad5bc7bcb7b042318
+  CrowdinSDK: c27c02e2995fb58ffb65113b2c7bc03e67dea36f
 
 PODFILE CHECKSUM: 3efeda1a4b0cfa7f4d6d66e1bee4ee5a1048af75
 

website/docs/setup.mdx

@@ -40,6 +40,9 @@ In the `application` method add:
 let crowdinProviderConfig = CrowdinProviderConfig(hashString: "{distribution_hash}",
   sourceLanguage: "{source_language}")
 
+let crowdinSDKConfig = CrowdinSDKConfig.config()
+  .with(crowdinProviderConfig: crowdinProviderConfig)
+
 CrowdinSDK.startWithConfig(crowdinSDKConfig, completion: {
     // SDK is ready to use, put code to change language, etc. here
 })