diff --git a/.swiftlint.yml b/.swiftlint.yml index 499194e16..008cf3507 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -4,6 +4,7 @@ disabled_rules: # rule identifiers to exclude from running - identifier_name - control_statement - nesting + - file_length line_length: 250 function_body_length: 100 diff --git a/.travis.yml b/.travis.yml index 01b375ba7..07779face 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: swift osx_image: xcode10.2 -before_script: "./scripts/add-keys.sh" +before_install: + - "pod repo update" + - "gem install cocoapods" +before_script: + - "./scripts/add-keys.sh" after_script: "./scripts/remove-key.sh" script: - "./scripts/swiftLint.sh" - - "./scripts/buildPrebidSDK.sh" - - "./scripts/testPrebidSDK.sh" + - "./scripts/buildPrebidMobile.sh" + - "./scripts/testPrebidMobile.sh" - "./scripts/testPrebidDemo.sh" diff --git a/PrebidMobile.podspec b/PrebidMobile.podspec index 0dca54ba5..d99c200fd 100644 --- a/PrebidMobile.podspec +++ b/PrebidMobile.podspec @@ -31,7 +31,6 @@ Pod::Spec.new do |s| s.platform = :ios, "9.0" s.swift_version = '5.0' s.source = { :git => "https://github.com/prebid/prebid-mobile-ios.git", :tag => "#{s.version}" } - s.source_files = "src/PrebidMobile/PrebidMobile","src/PrebidMobile/PrebidMobile/*.{h,swift}","src/PrebidMobile/PrebidMobile/**/*.swift" s.xcconfig = { :LIBRARY_SEARCH_PATHS => '$(inherited)', :OTHER_CFLAGS => '$(inherited)', diff --git a/PrebidMobile.xcodeproj/project.pbxproj b/PrebidMobile.xcodeproj/project.pbxproj index 999166df1..43ba4bb46 100644 --- a/PrebidMobile.xcodeproj/project.pbxproj +++ b/PrebidMobile.xcodeproj/project.pbxproj @@ -93,6 +93,16 @@ FAC837D82321583500565051 /* CollectionExtensionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC837D72321583500565051 /* CollectionExtensionTest.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + FAC9E22823284B2800113B04 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 60D792E9217E229A0080F428 /* Project object */; + proxyType = 1; + remoteGlobalIDString = FAAA00BC2322733E009DC7D6; + remoteInfo = PrebidMobile; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1F1C6E8B15DF27C3772977CE /* Pods-PrebidMobileCore.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrebidMobileCore.release.xcconfig"; path = "Target Support Files/Pods-PrebidMobileCore/Pods-PrebidMobileCore.release.xcconfig"; sourceTree = ""; }; 35FE3E0475D07E6FE2455850 /* Pods-PrebidMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrebidMobile.debug.xcconfig"; path = "Target Support Files/Pods-PrebidMobile/Pods-PrebidMobile.debug.xcconfig"; sourceTree = ""; }; @@ -446,6 +456,7 @@ buildRules = ( ); dependencies = ( + FAC9E22923284B2800113B04 /* PBXTargetDependency */, ); name = PrebidMobileTests; productName = PrebidMobileTests; @@ -703,6 +714,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + FAC9E22923284B2800113B04 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FAAA00BC2322733E009DC7D6 /* PrebidMobile */; + targetProxy = FAC9E22823284B2800113B04 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 60D79304217E229B0080F428 /* Debug */ = { isa = XCBuildConfiguration; diff --git a/PrebidMobile.xcodeproj/xcshareddata/xcschemes/PrebidMobileTests.xcscheme b/PrebidMobile.xcodeproj/xcshareddata/xcschemes/PrebidMobileTests.xcscheme index f04e0aadf..de74eeac8 100644 --- a/PrebidMobile.xcodeproj/xcshareddata/xcschemes/PrebidMobileTests.xcscheme +++ b/PrebidMobile.xcodeproj/xcshareddata/xcschemes/PrebidMobileTests.xcscheme @@ -13,9 +13,7 @@ shouldUseLaunchSchemeArgsEnv = "YES"> + skipped = "NO">