Remove macOS targets and use only iOS targets

pietrocaselani · Dec 31, 2019 · 4f76bc8 · 4f76bc8
1 parent 5a58fe4
commit 4f76bc8
Show file tree

Hide file tree

Showing 36 changed files with 404 additions and 765 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -12,7 +12,6 @@ excluded:
   - TVDBSwiftTests
   - TVDBSwiftTestable
   - CouchTrackerPlayground.playground
-  - Project.swift
 
 opt_in_rules:
   - force_unwrapping

diff --git a/CouchTrackerCore-iOS/Headers/Public/CouchTrackerCore_iOS.h b/CouchTrackerCore-iOS/Headers/Public/CouchTrackerCore_iOS.h
diff --git a/CouchTrackerCore-iOS/Info.plist b/CouchTrackerCore-iOS/Info.plist
diff --git a/CouchTrackerCore/Core/Bundle+CouchTrackerCore.swift b/CouchTrackerCore/Core/Bundle+CouchTrackerCore.swift
@@ -1,13 +1,7 @@
 import Foundation
 
 extension Bundle {
-  //	swiftlint:disable force_unwrapping
-  #if os(iOS) || os(watchOS) || os(tvOS)
-  public static let couchTrackerCore = Bundle(identifier: "io.github.pietrocaselani.CouchTrackerCore-iOS")!
-  #elseif os(OSX)
-  public static let couchTrackerCore = Bundle(identifier: "io.github.pietrocaselani.CouchTrackerCore")!
-  #endif
-  //	swiftlint:enable force_unwrapping
+  public static let couchTrackerCore = Bundle(identifier: "io.github.pietrocaselani.CouchTrackerCore")! // swiftlint:disable force_unwrapping
 }
 
 public func couchTrackerCoreLocalizable(key: String,

diff --git a/CouchTrackerCore/Headers/Public/CouchTrackerCore.h b/CouchTrackerCore/Headers/Public/CouchTrackerCore.h
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Pietro Caselani. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for CouchTrackerCore.
 FOUNDATION_EXPORT double CouchTrackerCoreVersionNumber;

diff --git a/CouchTrackerCoreTests/TMDBEntitiesMock.swift b/CouchTrackerCoreTests/TMDBEntitiesMock.swift
@@ -1,5 +1,6 @@
 @testable import CouchTrackerCore
 import TMDBSwift
+import Foundation
 
 final class TMDBEntitiesMock {
   static var configurationMock: Configuration {

diff --git a/CouchTrackerSync-iOS/Headers/Public/CouchTrackerSync_iOS.h b/CouchTrackerSync-iOS/Headers/Public/CouchTrackerSync_iOS.h
diff --git a/CouchTrackerSync-iOS/Info.plist b/CouchTrackerSync-iOS/Info.plist
diff --git a/CouchTrackerSync/CouchTrackerSync.swift b/CouchTrackerSync/CouchTrackerSync.swift
@@ -5,5 +5,5 @@ struct SyncState {}
 enum SyncAction {}
 
 func syncReducer(state: inout SyncState, action: SyncAction) -> [Observable<SyncAction>] {
-    return []
+  return []
 }
diff --git a/CouchTrackerSync/main.swift b/CouchTrackerSync/main.swift
diff --git a/CouchTrackerSyncTests/CouchTrackerSyncTests.swift b/CouchTrackerSyncTests/CouchTrackerSyncTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 
 final class CouchTrackerSyncTests: XCTestCase {
-    func testCouchTrackerSync() {
-        XCTAssertEqual(2 + 2, 4)
-    }
+  func testCouchTrackerSync() {
+    XCTAssertEqual(2 + 2, 4)
+  }
 }
diff --git a/Podfile b/Podfile
@@ -45,14 +45,6 @@ def ui_tests_pods
 end
 
 target 'CouchTrackerCore' do
-  platform :osx, OSX_VERSION
-  use_frameworks!
-  inhibit_all_warnings!
-
-  common_pods
-end
-
-target 'CouchTrackerCore-iOS' do
   platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
@@ -61,7 +53,7 @@ target 'CouchTrackerCore-iOS' do
 end
 
 target 'CouchTrackerCoreTests' do
-  platform :osx, OSX_VERSION
+  platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
 
@@ -70,14 +62,6 @@ target 'CouchTrackerCoreTests' do
 end
 
 target 'CouchTrackerSync' do
-  platform :osx, OSX_VERSION
-  use_frameworks!
-  inhibit_all_warnings!
-
-  sync_pods
-end
-
-target 'CouchTrackerSync-iOS' do
   platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
@@ -86,7 +70,7 @@ target 'CouchTrackerSync-iOS' do
 end
 
 target 'CouchTrackerSyncTests' do
-  platform :osx, OSX_VERSION
+  platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
 end
@@ -141,14 +125,6 @@ target 'CouchTrackerDebug' do
 end
 
 target 'TraktSwift' do
-  platform :osx, OSX_VERSION
-  use_frameworks!
-  inhibit_all_warnings!
-
-  api_pods
-end
-
-target 'TraktSwift-iOS' do
   platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
@@ -157,22 +133,14 @@ target 'TraktSwift-iOS' do
 end
 
 target 'TraktSwiftTests' do
-  platform :osx, OSX_VERSION
+  platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
 
   tests_shared_pods
 end
 
 target 'TMDBSwift' do
-  platform :osx, OSX_VERSION
-  use_frameworks!
-  inhibit_all_warnings!
-
-  api_pods
-end
-
-target 'TMDBSwift-iOS' do
   platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
@@ -181,22 +149,14 @@ target 'TMDBSwift-iOS' do
 end
 
 target 'TMDBSwiftTests' do
-  platform :osx, OSX_VERSION
+  platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
 
   tests_shared_pods
 end
 
 target 'TVDBSwift' do
-  platform :osx, OSX_VERSION
-  use_frameworks!
-  inhibit_all_warnings!
-
-  api_pods
-end
-
-target 'TVDBSwift-iOS' do
   platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
@@ -205,7 +165,7 @@ target 'TVDBSwift-iOS' do
 end
 
 target 'TVDBSwiftTests' do
-  platform :osx, OSX_VERSION
+  platform :ios, IOS_VERSION
   use_frameworks!
   inhibit_all_warnings!
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -127,6 +127,6 @@ SPEC CHECKSUMS:
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   Tabman: 63eae331ae7a9388ae389b1808f1939269fcdece
 
-PODFILE CHECKSUM: 5e8e127ec6e6153ac9493ab58e67f4cbc44cd9b2
+PODFILE CHECKSUM: c3c437cb7652a42e668167964166cf365bbfc11c
 
 COCOAPODS: 1.8.4