Skip to content

Commit f3bf9d2

Browse files
author
Chris
authored
Merge pull request #39 from nodes-ios/develop
3.0-beta
2 parents 41d6129 + 68bb918 commit f3bf9d2

81 files changed

Lines changed: 1571 additions & 1465 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,6 @@ playground.xcworkspace
184184

185185

186186
# End of https://www.gitignore.io/api/git,swift,xcode,macos,swiftpm,carthage,cocoapods,objective-c
187+
188+
# Ignore generated docs in repo
189+
jazzy_docs/

‎.swiftlint.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,24 @@ disabled_rules:
1313
excluded: # paths to ignore during linting. Takes precedence over `included`.
1414
- Pods/
1515
- Carthage/
16+
- "*.generated.swift"
1617

1718
file_length:
1819
warning: 400
1920
error: 600
2021

2122
line_length:
22-
warning: 150
23+
warning: 190
2324
error: 250
2425

2526
type_body_length:
2627
- 300 # warning
2728
- 400 # error
2829

30+
nesting:
31+
type_level: 3
32+
statement_level: 7
33+
2934
large_tuple: # warn user when using 3 values in tuple, give error if there are 4
3035
- 3
3136
- 4

‎.travis.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
language: objective-c
2+
osx_image: xcode10.3
3+
xcode_workspace: LocalizationManager.xcworkspace # path to your xcodeproj folder
4+
xcode_scheme: LocalizationManager
5+
xcode_destination: platform=iOS Simulator,OS=12.1,name=iPhone X
6+
branches:
7+
only:
8+
- master
9+
before_install:
10+
- pod install
11+
after_success:
12+
- gem install jazzy
13+
- make docs
14+
script:
15+
- echo "Skipping building on Travis, we're building for docs ourselves."
16+
deploy:
17+
provider: pages
18+
skip-cleanup: true
19+
github-token: $GH_TOKEN # Set in the settings page of your repository, as a secure variable
20+
local-dir: jazzy_docs
21+
keep_history: true
22+
on:
23+
branch: master

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Master
2-
## 0.0.17: Persisted Translations Improvements
3-
## 0.0.16: Persisted Translations Improvements
4-
## 0.0.15: Persisted Translations Improvements
2+
## 0.0.17: Persisted Localizations Improvements
3+
## 0.0.16: Persisted Localizations Improvements
4+
## 0.0.15: Persisted Localizations Improvements
55
## 0.0.14: Fixes in UserDefaults and Codable
66
## 0.0.13: More refactoring
77
## 0.0.12: More refactoring

‎Documentation/IntegrationGuide.md‎

Whitespace-only changes.

TranslationManager.xcodeproj/project.pbxproj renamed to LocalizationManager.xcodeproj/project.pbxproj

Lines changed: 401 additions & 412 deletions
Large diffs are not rendered by default.

TranslationManager.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to LocalizationManager.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TranslationManager.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to LocalizationManager.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.

TranslationManager.xcodeproj/xcshareddata/xcschemes/TranslationManager-macOS.xcscheme renamed to LocalizationManager.xcodeproj/xcshareddata/xcschemes/LocalizationManager-macOS.xcscheme

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "8C50882D230D1D0A00FB80CD"
18-
BuildableName = "TranslationManager.framework"
19-
BlueprintName = "TranslationManager-macOS"
20-
ReferencedContainer = "container:TranslationManager.xcodeproj">
18+
BuildableName = "LocalizationManager.framework"
19+
BlueprintName = "LocalizationManager-macOS"
20+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -42,9 +42,9 @@
4242
<BuildableReference
4343
BuildableIdentifier = "primary"
4444
BlueprintIdentifier = "8C508835230D1D0A00FB80CD"
45-
BuildableName = "TranslationManager-macOSTests.xctest"
46-
BlueprintName = "TranslationManager-macOSTests"
47-
ReferencedContainer = "container:TranslationManager.xcodeproj">
45+
BuildableName = "LocalizationManager-macOSTests.xctest"
46+
BlueprintName = "LocalizationManager-macOSTests"
47+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
4848
</BuildableReference>
4949
<SkippedTests>
5050
<Test
@@ -68,9 +68,9 @@
6868
<BuildableReference
6969
BuildableIdentifier = "primary"
7070
BlueprintIdentifier = "8C50882D230D1D0A00FB80CD"
71-
BuildableName = "TranslationManager.framework"
72-
BlueprintName = "TranslationManager-macOS"
73-
ReferencedContainer = "container:TranslationManager.xcodeproj">
71+
BuildableName = "LocalizationManager.framework"
72+
BlueprintName = "LocalizationManager-macOS"
73+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
7474
</BuildableReference>
7575
</MacroExpansion>
7676
</LaunchAction>
@@ -84,9 +84,9 @@
8484
<BuildableReference
8585
BuildableIdentifier = "primary"
8686
BlueprintIdentifier = "8C50882D230D1D0A00FB80CD"
87-
BuildableName = "TranslationManager.framework"
88-
BlueprintName = "TranslationManager-macOS"
89-
ReferencedContainer = "container:TranslationManager.xcodeproj">
87+
BuildableName = "LocalizationManager.framework"
88+
BlueprintName = "LocalizationManager-macOS"
89+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
9090
</BuildableReference>
9191
</MacroExpansion>
9292
</ProfileAction>

TranslationManager.xcodeproj/xcshareddata/xcschemes/TranslationManager-tvOS.xcscheme renamed to LocalizationManager.xcodeproj/xcshareddata/xcschemes/LocalizationManager-tvOS.xcscheme

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "8CBF5801230BCA6B00C60FF7"
18-
BuildableName = "TranslationManager.framework"
19-
BlueprintName = "TranslationManager-tvOS"
20-
ReferencedContainer = "container:TranslationManager.xcodeproj">
18+
BuildableName = "LocalizationManager.framework"
19+
BlueprintName = "LocalizationManager-tvOS"
20+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -42,9 +42,9 @@
4242
<BuildableReference
4343
BuildableIdentifier = "primary"
4444
BlueprintIdentifier = "8CBF5809230BCA6C00C60FF7"
45-
BuildableName = "TranslationManager-tvOSTests.xctest"
46-
BlueprintName = "TranslationManager-tvOSTests"
47-
ReferencedContainer = "container:TranslationManager.xcodeproj">
45+
BuildableName = "LocalizationManager-tvOSTests.xctest"
46+
BlueprintName = "LocalizationManager-tvOSTests"
47+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
4848
</BuildableReference>
4949
<SkippedTests>
5050
<Test
@@ -68,9 +68,9 @@
6868
<BuildableReference
6969
BuildableIdentifier = "primary"
7070
BlueprintIdentifier = "8CBF5801230BCA6B00C60FF7"
71-
BuildableName = "TranslationManager.framework"
72-
BlueprintName = "TranslationManager-tvOS"
73-
ReferencedContainer = "container:TranslationManager.xcodeproj">
71+
BuildableName = "LocalizationManager.framework"
72+
BlueprintName = "LocalizationManager-tvOS"
73+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
7474
</BuildableReference>
7575
</MacroExpansion>
7676
</LaunchAction>
@@ -84,9 +84,9 @@
8484
<BuildableReference
8585
BuildableIdentifier = "primary"
8686
BlueprintIdentifier = "8CBF5801230BCA6B00C60FF7"
87-
BuildableName = "TranslationManager.framework"
88-
BlueprintName = "TranslationManager-tvOS"
89-
ReferencedContainer = "container:TranslationManager.xcodeproj">
87+
BuildableName = "LocalizationManager.framework"
88+
BlueprintName = "LocalizationManager-tvOS"
89+
ReferencedContainer = "container:LocalizationManager.xcodeproj">
9090
</BuildableReference>
9191
</MacroExpansion>
9292
</ProfileAction>

0 commit comments

Comments
 (0)