Merge branch 'release/1.3.0'

Digipolitan · May 31, 2019 · 1f22054 · 1f22054
2 parents 0516c80 + 1c289c5
commit 1f22054
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/LocalizationToolkit.podspec b/LocalizationToolkit.podspec
@@ -9,7 +9,7 @@ s.license = { :type => "BSD", :file => "LICENSE" }
 s.source_files = 'Sources/LocalizationToolkit/*.{swift,h}'
 s.ios.source_files = 'Sources/LocalizationToolkit/UIKit/*.{swift,h}'
 s.tvos.source_files = 'Sources/LocalizationToolkit/UIKit/*.{swift,h}'
-s.watchos.source_files = 'Sources/LocalizationToolkit/UIKit/*.{swift,h}'
+s.watchos.source_files = 'Sources/LocalizationToolkit/UIKit/UIImage+Localization.swift'
 s.macos.source_files = 'Sources/LocalizationToolkit/AppKit/*.{swift,h}'
 s.ios.deployment_target = '8.0'
 s.watchos.deployment_target = '2.0'

diff --git a/LocalizationToolkit.xcodeproj/project.pbxproj b/LocalizationToolkit.xcodeproj/project.pbxproj
@@ -24,6 +24,10 @@
 		51FE296022A13BAC00EED0EC /* UILabel+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE295C22A13B8C00EED0EC /* UILabel+Localization.swift */; };
 		51FE296222A13BCE00EED0EC /* UIButton+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE296122A13BCE00EED0EC /* UIButton+Localization.swift */; };
 		51FE296422A13BEC00EED0EC /* UITextField+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE296322A13BEC00EED0EC /* UITextField+Localization.swift */; };
+		51FE298122A147C500EED0EC /* UILabel+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE295C22A13B8C00EED0EC /* UILabel+Localization.swift */; };
+		51FE298222A147CB00EED0EC /* UITextView+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE295E22A13BA700EED0EC /* UITextView+Localization.swift */; };
+		51FE298322A147D200EED0EC /* UIButton+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE296122A13BCE00EED0EC /* UIButton+Localization.swift */; };
+		51FE298422A147D500EED0EC /* UITextField+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE296322A13BEC00EED0EC /* UITextField+Localization.swift */; };
 		6D453CAF7BFADECB935BEE5A /* Pods_Frameworks_LocalizationToolkit_watchOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23417784C827FE443744EB11 /* Pods_Frameworks_LocalizationToolkit_watchOS.framework */; };
 		7469A9B0074A3573EF6597F4 /* Pods_Frameworks_LocalizationToolkit_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8D60D94568CD1874C353733 /* Pods_Frameworks_LocalizationToolkit_OSX.framework */; };
 		7EBFB0B6B653C7A3BD0B83DB /* Pods_Frameworks_LocalizationToolkit_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA790FDBFD220F0C7A2C5EF /* Pods_Frameworks_LocalizationToolkit_iOS.framework */; };
@@ -926,12 +930,16 @@
 			buildActionMask = 2147483647;
 			files = (
 				A33B2C531FB99844009A94FA /* UINib+Localization.swift in Sources */,
+				51FE298222A147CB00EED0EC /* UITextView+Localization.swift in Sources */,
 				A33B2C331FB993FA009A94FA /* Bundle+Localization.swift in Sources */,
 				A33B2C551FB99844009A94FA /* UIStoryboard+Localization.swift in Sources */,
 				A33B2C431FB993FA009A94FA /* String+Localization.swift in Sources */,
 				A3892C0D1FB7CDE7009C2712 /* Localization.swift in Sources */,
+				51FE298322A147D200EED0EC /* UIButton+Localization.swift in Sources */,
 				A33B2C2F1FB993FA009A94FA /* UIImage+Localization.swift in Sources */,
+				51FE298422A147D500EED0EC /* UITextField+Localization.swift in Sources */,
 				A33B2C471FB993FA009A94FA /* MultilingualString.swift in Sources */,
+				51FE298122A147C500EED0EC /* UILabel+Localization.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/...lizationToolkitSample-watchOS/LocalizationToolkitSample-watchOS.xcodeproj/project.pbxproj b/...lizationToolkitSample-watchOS/LocalizationToolkitSample-watchOS.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		1D25B01A85C50721A7F6DA57 /* Pods_Samples_watchOS_LocalizationToolkitSample_watchOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 192221AA4E8CF2048E97DFAB /* Pods_Samples_watchOS_LocalizationToolkitSample_watchOS.framework */; };
 		51FE297022A140A000EED0EC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 51FE297222A140A000EED0EC /* Localizable.strings */; };
-		51FE297822A1429D00EED0EC /* LocalizationToolkit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51FE297722A1429D00EED0EC /* LocalizationToolkit.framework */; };
 		A30D641F1E0D759D00A3CE45 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A30D641E1E0D759D00A3CE45 /* AppDelegate.swift */; };
 		A30D64261E0D759D00A3CE45 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A30D64251E0D759D00A3CE45 /* Assets.xcassets */; };
 		A30D64291E0D759D00A3CE45 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A30D64271E0D759D00A3CE45 /* LaunchScreen.storyboard */; };
@@ -87,7 +86,6 @@
 		192221AA4E8CF2048E97DFAB /* Pods_Samples_watchOS_LocalizationToolkitSample_watchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Samples_watchOS_LocalizationToolkitSample_watchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		20FCAB03B6200D30C3A47298 /* Pods-LocalizationToolkitSample-LocalizationToolkitSample-watchOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LocalizationToolkitSample-LocalizationToolkitSample-watchOS.debug.xcconfig"; path = "../../Pods/Target Support Files/Pods-LocalizationToolkitSample-LocalizationToolkitSample-watchOS/Pods-LocalizationToolkitSample-LocalizationToolkitSample-watchOS.debug.xcconfig"; sourceTree = "<group>"; };
 		51FE297122A140A000EED0EC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		51FE297722A1429D00EED0EC /* LocalizationToolkit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocalizationToolkit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8C3FDC6F5B65B3F062A771FF /* Pods_Samples_watchOS_LocalizationToolkitSample_watchOS_WatchKit_Extension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Samples_watchOS_LocalizationToolkitSample_watchOS_WatchKit_Extension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A1BE2B4E3595007C23F873C4 /* Pods_LocalizationToolkitSample_LocalizationToolkitSample_watchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LocalizationToolkitSample_LocalizationToolkitSample_watchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A30D641B1E0D759D00A3CE45 /* LocalizationToolkitSample-watchOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "LocalizationToolkitSample-watchOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -136,7 +134,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				51FE297822A1429D00EED0EC /* LocalizationToolkit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -203,7 +200,6 @@
 		A30D645D1E0D76BC00A3CE45 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				51FE297722A1429D00EED0EC /* LocalizationToolkit.framework */,
 				A30D64611E0D76DB00A3CE45 /* watchOS */,
 				A30D64601E0D76D600A3CE45 /* iOS */,
 				A1BE2B4E3595007C23F873C4 /* Pods_LocalizationToolkitSample_LocalizationToolkitSample_watchOS.framework */,