diff --git a/.circleci/config.yml b/.circleci/config.yml index 629909432..6e0eed91d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,25 +38,6 @@ jobs: - checkout - run: swift build - static-pod-test: - parameters: - xcode: - type: string - macos: - xcode: << parameters.xcode >> - environment: - HOMEBREW_NO_AUTO_UPDATE: 1 - steps: - - checkout - - run: - name: CP static obj-c - command: | - cd Tests/PodTests/static - brew install xcodegen - xcodegen generate - pod install - xcodebuild -sdk iphonesimulator -workspace StaticPod.xcworkspace -scheme 'app' clean build | xcpretty - build-job: parameters: xcode: @@ -138,6 +119,3 @@ workflows: - spm-job: name: "SPM_build" xcode: "10.2.0" - - static-pod-test: - name: "CP_static" - xcode: "10.2.0" diff --git a/MapboxDirections.podspec b/MapboxDirections.swift.podspec similarity index 98% rename from MapboxDirections.podspec rename to MapboxDirections.swift.podspec index 5a6c91610..92aa0962f 100644 --- a/MapboxDirections.podspec +++ b/MapboxDirections.swift.podspec @@ -43,7 +43,7 @@ Pod::Spec.new do |s| # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.requires_arc = true - s.module_name = "MapboxDirections" + //s.module_name = "MapboxDirections" s.swift_version = "4.0" s.dependency "Polyline", "~> 4.2" diff --git a/Tests/PodTests/static/.gitignore b/Tests/PodTests/static/.gitignore deleted file mode 100644 index ab0b0c11d..000000000 --- a/Tests/PodTests/static/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Pods/ -StaticPod.xcodeproj -StaticPod.xcworkspace -Podfile.lock diff --git a/Tests/PodTests/static/Podfile b/Tests/PodTests/static/Podfile deleted file mode 100644 index 7db364788..000000000 --- a/Tests/PodTests/static/Podfile +++ /dev/null @@ -1,6 +0,0 @@ -platform :ios, '12.0' - -target 'app' do - pod 'MapboxDirections', :path => '../../../' -end - diff --git a/Tests/PodTests/static/Sources/AppDelegate.h b/Tests/PodTests/static/Sources/AppDelegate.h deleted file mode 100644 index 2e23d9633..000000000 --- a/Tests/PodTests/static/Sources/AppDelegate.h +++ /dev/null @@ -1,5 +0,0 @@ -#import - -@interface AppDelegate : UIResponder -@property (strong, nonatomic) UIWindow *window; -@end diff --git a/Tests/PodTests/static/Sources/AppDelegate.m b/Tests/PodTests/static/Sources/AppDelegate.m deleted file mode 100644 index 02ab12838..000000000 --- a/Tests/PodTests/static/Sources/AppDelegate.m +++ /dev/null @@ -1,13 +0,0 @@ -#import "AppDelegate.h" -@import MapboxDirections; - -@interface AppDelegate () -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - return YES; -} - -@end diff --git a/Tests/PodTests/static/Sources/Empty.swift b/Tests/PodTests/static/Sources/Empty.swift deleted file mode 100644 index fecc4ab44..000000000 --- a/Tests/PodTests/static/Sources/Empty.swift +++ /dev/null @@ -1 +0,0 @@ -import Foundation diff --git a/Tests/PodTests/static/Sources/Info.plist b/Tests/PodTests/static/Sources/Info.plist deleted file mode 100644 index 16be3b681..000000000 --- a/Tests/PodTests/static/Sources/Info.plist +++ /dev/null @@ -1,45 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/Tests/PodTests/static/Sources/ViewController.h b/Tests/PodTests/static/Sources/ViewController.h deleted file mode 100644 index d2fc081c6..000000000 --- a/Tests/PodTests/static/Sources/ViewController.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface ViewController : UIViewController -@end diff --git a/Tests/PodTests/static/Sources/ViewController.m b/Tests/PodTests/static/Sources/ViewController.m deleted file mode 100644 index 78e942ce3..000000000 --- a/Tests/PodTests/static/Sources/ViewController.m +++ /dev/null @@ -1,8 +0,0 @@ -#import "ViewController.h" -#import - -@interface ViewController () -@end - -@implementation ViewController -@end diff --git a/Tests/PodTests/static/Sources/app-Bridging-Header.h b/Tests/PodTests/static/Sources/app-Bridging-Header.h deleted file mode 100644 index 1b2cb5d6d..000000000 --- a/Tests/PodTests/static/Sources/app-Bridging-Header.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - diff --git a/Tests/PodTests/static/Sources/main.m b/Tests/PodTests/static/Sources/main.m deleted file mode 100644 index 81e84cbb7..000000000 --- a/Tests/PodTests/static/Sources/main.m +++ /dev/null @@ -1,8 +0,0 @@ -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/Tests/PodTests/static/project.yml b/Tests/PodTests/static/project.yml deleted file mode 100644 index 8988bfd4d..000000000 --- a/Tests/PodTests/static/project.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: StaticPod -options: - bundleIdPrefix: com.mapbox.staticpod -targets: - app: - type: application - platform: iOS - deploymentTarget: "12.0" - sources: [Sources] - settings: - base: - SWIFT_OBJC_BRIDGING_HEADER: Sources/app-Bridging-Header.h