Merge branch 'master' into examples

iidioter · Nov 8, 2020 · 2c38961 · 2c38961
2 parents a100366 + 4d15244
commit 2c38961
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -19,9 +19,9 @@ jobs:
       uses: actions/cache@v1
       with:
         path: .build
-        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+        key: ${{ runner.os }}spm${{ hashFiles('**/Package.resolved') }}
         restore-keys: |
-          ${{ runner.os }}-spm-
+          ${{ runner.os }}spm
     - name: Test
       run: swift test -v
 
@@ -42,14 +42,14 @@ jobs:
         chmod +x build/Debug/rswift
     - name: Pull cache
       uses: actions/cache@v1
-      id: pod-cache
+      id: podcache
       with:
         path: Examples/Pods
-        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+        key: ${{ runner.os }}pods${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
-          ${{ runner.os }}-pods-
+          ${{ runner.os }}pods
     - name: Install pods
-      if: steps.pod-cache.outputs.cache-hit != 'true'
+      if: steps.podcache.outputs.cache-hit != 'true'
       run: pod install --project-directory=Examples
     - name: Test
       run: fastlane scan --workspace "Examples/RswiftExamples.xcworkspace" --scheme "ResourceApp"
@@ -71,14 +71,14 @@ jobs:
         chmod +x build/Debug/rswift
     - name: Pull cache
       uses: actions/cache@v1
-      id: pod-cache
+      id: podcache
       with:
         path: Examples/Pods
-        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+        key: ${{ runner.os }}pods${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
-          ${{ runner.os }}-pods-
+          ${{ runner.os }}pods
     - name: Install pods
-      if: steps.pod-cache.outputs.cache-hit != 'true'
+      if: steps.podcache.outputs.cache-hit != 'true'
       run: pod install --project-directory=Examples
     - name: Test
       run: fastlane scan --workspace "Examples/RswiftExamples.xcworkspace" --scheme "ResourceApp-tvOS"
@@ -92,9 +92,9 @@ jobs:
       uses: actions/cache@v1
       with:
         path: .build
-        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+        key: ${{ runner.os }}spm${{ hashFiles('**/Package.resolved') }}
         restore-keys: |
-          ${{ runner.os }}-spm-
+          ${{ runner.os }}spm
     - name: Set version
       run: |
         sed -i "" "s/\(static let version = \"\)Unknown\(\"\)/\1Development build: ${GITHUB_SHA}\2/" Sources/rswift/Rswift.swift

diff --git a/R.swift.podspec b/R.swift.podspec
@@ -24,11 +24,11 @@ Pod::Spec.new do |spec|
   spec.source             = { :http => "https://github.com/mac-cain13/R.swift/releases/download/v#{spec.version}/rswift-v#{spec.version}.zip" }
   spec.swift_version      = "5.1"
 
-  spec.ios.deployment_target     = '8.0'
+  spec.ios.deployment_target     = '9.0'
   spec.tvos.deployment_target    = '9.0'
   spec.watchos.deployment_target = '2.2'
 
-  spec.dependency "R.swift.Library", "~> 5.2.0"
+  spec.dependency "R.swift.Library", "~> 5.3.0"
 
   spec.preserve_paths = "rswift"
 

diff --git a/Sources/RswiftCore/Generators/StringsStructGenerator.swift b/Sources/RswiftCore/Generators/StringsStructGenerator.swift
@@ -303,7 +303,7 @@ struct StringsStructGenerator: ExternalOnlyStructGenerator {
         }
 
         guard let (locale, bundle) = localeBundle(tableName: "\(values.tableName)", preferredLanguages: preferredLanguages) else {
-          return "\(values.key)"
+          return "\(values.key.escapedStringLiteral)"
         }
 
         let format = \(values.swiftCode(bundle: "bundle"))