Merge pull request #20 from infinum/feature/objc-support

Feature/objc support
infinum · Mar 19, 2019 · e6bf109 · e6bf109
2 parents 2749ec6 + 2a02581
commit e6bf109
Show file tree

Hide file tree

Showing 36 changed files with 2,173 additions and 1,730 deletions.
diff --git a/Example/Japx.xcodeproj/project.pbxproj b/Example/Japx.xcodeproj/project.pbxproj
@@ -22,6 +22,8 @@
  2C5FA42C202CA39500399CC7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C5FA41B202CA35D00399CC7 /* Main.storyboard */; };
  2C5FA42D202CA39700399CC7 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C5FA419202CA35D00399CC7 /* LaunchScreen.xib */; };
  4A82CC5FA2C793776CE5D637 /* Pods_Japx_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 544F967701250F279B5314AE /* Pods_Japx_Example.framework */; };
+ 4F9A385D220099BC0063BEB3 /* DecoderTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F9A385C220099BC0063BEB3 /* DecoderTester.m */; };
+ 4F9A385F220099C80063BEB3 /* EncoderTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F9A385E220099C80063BEB3 /* EncoderTester.m */; };
  B5F3D0748234B83C4EE38F74 /* Pods_Japx_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E817D346E8E2BDDF0DC5F3F3 /* Pods_Japx_Tests.framework */; };
  E18794E520189E8B00E472C4 /* DecoderTester.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18794E120189D8000E472C4 /* DecoderTester.swift */; };
  E18794E620189E8B00E472C4 /* EncoderTester.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18794E320189D8E00E472C4 /* EncoderTester.swift */; };
@@ -73,6 +75,8 @@
  3F412D2933D7C24976F407E5 /* Pods-Japx_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Japx_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Japx_Example/Pods-Japx_Example.release.xcconfig"; sourceTree = "<group>"; };
  4466ED105828243F2F36B17D /* Pods-Japx_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Japx_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests.release.xcconfig"; sourceTree = "<group>"; };
  484238D1DA26A9BA2E5115A8 /* Pods-Japx_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Japx_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests.release.xcconfig"; sourceTree = "<group>"; };
+ 4F9A385C220099BC0063BEB3 /* DecoderTester.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DecoderTester.m; sourceTree = "<group>"; };
+ 4F9A385E220099C80063BEB3 /* EncoderTester.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EncoderTester.m; sourceTree = "<group>"; };
  506A9BD1FF981EFDA31530C6 /* Pods-Japx_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Japx_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Japx_Example/Pods-Japx_Example.debug.xcconfig"; sourceTree = "<group>"; };
  510A39153BE0BF03E5F7F5DA /* Pods-Japx_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Japx_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests.debug.xcconfig"; sourceTree = "<group>"; };
  5449EDE34B60041F4CC6152F /* Pods-Japx_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Japx_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -163,6 +167,32 @@
  path = Japx;
  sourceTree = "<group>";
  };
+ 4F9A3856220095B50063BEB3 /* Objc */ = {
+ isa = PBXGroup;
+ children = (
+ 4F9A385C220099BC0063BEB3 /* DecoderTester.m */,
+ 4F9A385E220099C80063BEB3 /* EncoderTester.m */,
+ );
+ path = Objc;
+ sourceTree = "<group>";
+ };
+ 4F9A3857220095C30063BEB3 /* Swift */ = {
+ isa = PBXGroup;
+ children = (
+ E18794E120189D8000E472C4 /* DecoderTester.swift */,
+ E18794E320189D8E00E472C4 /* EncoderTester.swift */,
+ );
+ path = Swift;
+ sourceTree = "<group>";
+ };
+ 4F9A385B220099A00063BEB3 /* Utilities */ = {
+ isa = PBXGroup;
+ children = (
+ E18794E720189EE500E472C4 /* AdditionalFunctions.swift */,
+ );
+ path = Utilities;
+ sourceTree = "<group>";
+ };
  607FACC71AFB9204008FA782 = {
  isa = PBXGroup;
  children = (
@@ -187,9 +217,9 @@
  607FACE81AFB9204008FA782 /* Tests */ = {
  isa = PBXGroup;
  children = (
- E18794E720189EE500E472C4 /* AdditionalFunctions.swift */,
- E18794E120189D8000E472C4 /* DecoderTester.swift */,
- E18794E320189D8E00E472C4 /* EncoderTester.swift */,
+ 4F9A385B220099A00063BEB3 /* Utilities */,
+ 4F9A3856220095B50063BEB3 /* Objc */,
+ 4F9A3857220095C30063BEB3 /* Swift */,
  E18794ED2018ABA000E472C4 /* Resources */,
  607FACE91AFB9204008FA782 /* Supporting Files */,
  );
@@ -397,7 +427,7 @@
  607FACE41AFB9204008FA782 = {
  CreatedOnToolsVersion = 6.3.1;
  DevelopmentTeam = 5F5M64F878;
- LastSwiftMigration = 0900;
+ LastSwiftMigration = 1010;
  TestTargetID = 607FACCF1AFB9204008FA782;
  };
  };
@@ -503,7 +533,7 @@
  files = (
  );
  inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Japx_Example/Pods-Japx_Example-frameworks.sh",
+ "${SRCROOT}/Pods/Target Support Files/Pods-Japx_Example/Pods-Japx_Example-frameworks.sh",
  "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
  "${BUILT_PRODUCTS_DIR}/Japx/Japx.framework",
  "${BUILT_PRODUCTS_DIR}/Moya/Moya.framework",
@@ -522,7 +552,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Japx_Example/Pods-Japx_Example-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Japx_Example/Pods-Japx_Example-frameworks.sh\"\n";
  showEnvVarsInLog = 0;
  };
  C1B5BB1EF527CE5CA3158537 /* [CP] Embed Pods Frameworks */ = {
@@ -531,7 +561,7 @@
  files = (
  );
  inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests-frameworks.sh",
+ "${SRCROOT}/Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests-frameworks.sh",
  "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
  "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
  );
@@ -542,7 +572,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Japx_Tests/Pods-Japx_Tests-frameworks.sh\"\n";
  showEnvVarsInLog = 0;
  };
 /* End PBXShellScriptBuildPhase section */
@@ -566,8 +596,10 @@
  buildActionMask = 2147483647;
  files = (
  E18794E620189E8B00E472C4 /* EncoderTester.swift in Sources */,
+ 4F9A385F220099C80063BEB3 /* EncoderTester.m in Sources */,
  E18794F52018AC2200E472C4 /* AdditionalFunctions.swift in Sources */,
  E18794E520189E8B00E472C4 /* DecoderTester.swift in Sources */,
+ 4F9A385D220099BC0063BEB3 /* DecoderTester.m in Sources */,
  );
  runOnlyForDeploymentPostprocessing = 0;
  };
@@ -740,6 +772,7 @@
  isa = XCBuildConfiguration;
  baseConfigurationReference = 510A39153BE0BF03E5F7F5DA /* Pods-Japx_Tests.debug.xcconfig */;
  buildSettings = {
+ CLANG_ENABLE_MODULES = YES;
  DEVELOPMENT_TEAM = 5F5M64F878;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
  GCC_PREPROCESSOR_DEFINITIONS = (
@@ -750,6 +783,8 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_OBJC_BRIDGING_HEADER = "";
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
  SWIFT_SWIFT3_OBJC_INFERENCE = Default;
  SWIFT_VERSION = 4.2;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Japx_Example.app/Japx_Example";
@@ -760,12 +795,14 @@
  isa = XCBuildConfiguration;
  baseConfigurationReference = 82CEBBAB6F2E42C2289E0421 /* Pods-Japx_Tests.release.xcconfig */;
  buildSettings = {
+ CLANG_ENABLE_MODULES = YES;
  DEVELOPMENT_TEAM = 5F5M64F878;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
  INFOPLIST_FILE = Tests/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_OBJC_BRIDGING_HEADER = "";
  SWIFT_SWIFT3_OBJC_INFERENCE = Default;
  SWIFT_VERSION = 4.2;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Japx_Example.app/Japx_Example";

diff --git a/Example/Podfile b/Example/Podfile
@@ -2,6 +2,7 @@ platform :ios, '9.0'
 use_frameworks!
 
 target 'Japx_Example' do
+ pod 'Japx/ObjC', :path => '../'
  pod 'Japx/RxCodableMoya', :path => '../'
 
  target 'Japx_Tests' do

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,20 +1,22 @@
 PODS:
  - Alamofire (4.8.1)
- - Japx/Codable (2.0.0):
+ - Japx/Codable (2.0.1):
  - Japx/Core
- - Japx/CodableMoya (2.0.0):
+ - Japx/CodableMoya (2.0.1):
  - Japx/Codable
  - Japx/Core
  - Japx/Moya
- - Japx/Core (2.0.0)
- - Japx/Moya (2.0.0):
+ - Japx/Core (2.0.1)
+ - Japx/Moya (2.0.1):
  - Japx/Core
  - Moya/RxSwift (~> 12.0)
- - Japx/RxCodableMoya (2.0.0):
+ - Japx/Objc (2.0.1):
+ - Japx/Core
+ - Japx/RxCodableMoya (2.0.1):
  - Japx/CodableMoya
  - Japx/Core
  - Japx/RxMoya
- - Japx/RxMoya (2.0.0):
+ - Japx/RxMoya (2.0.1):
  - Japx/Moya
  - Moya/Core (12.0.1):
  - Alamofire (~> 4.1)
@@ -30,6 +32,7 @@ PODS:
  - RxAtomic (~> 4.4)
 
 DEPENDENCIES:
+ - Japx/Objc (from `../`)
  - Japx/RxCodableMoya (from `../`)
  - Nimble
  - Quick
@@ -50,14 +53,14 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
  Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
- Japx: 53891173aff6036669d85641f1d87f3943204f47
+ Japx: 843e4a4d64edb26ac68c72cc78c70e9a9b4a1940
  Moya: cf730b3cd9e005401ef37a85143aa141a12fd38f
  Nimble: 5e94a8cacb355943c6c87198035dc4adbb0f10e4
  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
  Result: bd966fac789cc6c1563440b348ab2598cc24d5c7
  RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
  RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
 
-PODFILE CHECKSUM: 0f489b9dcf880ba0fa2ce6461c9179e581a1b6fe
+PODFILE CHECKSUM: bdb7fd65b211730c839cce1820cf68242dcb18b8
 
-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.5.3
diff --git a/Example/Pods/Local Podspecs/Japx.podspec.json b/Example/Pods/Local Podspecs/Japx.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock