Skip to content

Commit 3ed22f8

Browse files
committed
Merge branch 'release/1.1.2'
2 parents 6865cd9 + 9c39f65 commit 3ed22f8

File tree

26 files changed

+145
-394
lines changed

26 files changed

+145
-394
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.2

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode9
1+
osx_image: xcode10
22
language: objective-c
33
cache:
44
- bundler
@@ -14,5 +14,5 @@ before_install:
1414
- brew update
1515
- bundle install && brew bundle
1616
install: bundle exec pod install --repo-update --silent
17-
script: bundle exec fastlane run_tests
17+
script: bundle exec fastlane tests
1818
after_success: bundle exec fastlane ci_framework_deploy

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55

66
---
77

8+
## [1.1.2](https://github.com/Digipolitan/localization-toolkit/releases/tag/v1.1.2)
9+
10+
fix swift version 4.2
11+
12+
---
13+
814
## [1.1.1](https://github.com/Digipolitan/localization-toolkit/releases/tag/v1.1.1)
915

1016
add hashable to multilingualString

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source "https://rubygems.org"
22

3-
gem "cocoapods"
3+
gem "cocoapods", ">= 1.6.0.beta"
44
gem "fastlane"
55
gem 'digipolitan-apps-tools'

LocalizationToolkit.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "LocalizationToolkit"
3-
s.version = "1.1.1"
3+
s.version = "1.1.2"
44
s.summary = "Localization helper for swift project"
55
s.homepage = "https://github.com/Digipolitan/localization-toolkit"
66
s.authors = "Digipolitan"
@@ -15,5 +15,5 @@ s.ios.deployment_target = '8.0'
1515
s.watchos.deployment_target = '2.0'
1616
s.tvos.deployment_target = '9.0'
1717
s.osx.deployment_target = '10.10'
18-
s.requires_arc = true
18+
s.swift_version = '4.2'
1919
end

0 commit comments

Comments
 (0)