diff --git a/.gitmodules b/.gitmodules index 62b03b6..8c630c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "core"] path = core - url = https://github.com/ConnectSDK/Connect-SDK-iOS-Core.git + url = https://github.com/kdgm/Connect-SDK-iOS-Core.git +[submodule "modules/google-cast"] + path = modules/google-cast + url = https://github.com/kdgm/Connect-SDK-iOS-Google-Cast diff --git a/ConnectSDK.xcodeproj/project.pbxproj b/ConnectSDK.xcodeproj/project.pbxproj index 0d9fdb8..6e9eba7 100644 --- a/ConnectSDK.xcodeproj/project.pbxproj +++ b/ConnectSDK.xcodeproj/project.pbxproj @@ -1620,7 +1620,7 @@ EA61EB0818FE485B00D75696 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0730; ORGANIZATIONNAME = "LG Electronics"; TargetAttributes = { 44375E7E1A25265600D2F6DE = { @@ -1950,6 +1950,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.connectsdk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1977,6 +1978,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.connectsdk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -2012,6 +2014,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.connectsdk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -2044,6 +2047,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.connectsdk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -2079,6 +2083,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.connectsdk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -2111,6 +2116,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.connectsdk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -2132,6 +2138,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; diff --git a/ConnectSDK.xcodeproj/project.xcworkspace/xcshareddata/ConnectSDK.xcscmblueprint b/ConnectSDK.xcodeproj/project.xcworkspace/xcshareddata/ConnectSDK.xcscmblueprint new file mode 100644 index 0000000..81ee2da --- /dev/null +++ b/ConnectSDK.xcodeproj/project.xcworkspace/xcshareddata/ConnectSDK.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "318C307930E56AD07F11FB6006A9C3ED594CDA4C", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "11E76B4A8B249084BFAB339B1C0AB3F9B9875C19" : 0, + "318C307930E56AD07F11FB6006A9C3ED594CDA4C" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D1CC3583-3752-4630-AF47-8802A4AD80A6", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "11E76B4A8B249084BFAB339B1C0AB3F9B9875C19" : "Connect-SDK-iOS-Lite\/core\/", + "318C307930E56AD07F11FB6006A9C3ED594CDA4C" : "Connect-SDK-iOS-Lite\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "ConnectSDK", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ConnectSDK.xcodeproj", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ConnectSDK\/Connect-SDK-iOS-Core.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "11E76B4A8B249084BFAB339B1C0AB3F9B9875C19" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ConnectSDK\/Connect-SDK-iOS-Lite.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "318C307930E56AD07F11FB6006A9C3ED594CDA4C" + } + ] +} \ No newline at end of file diff --git a/ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDK.xcscheme b/ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDK.xcscheme index 6a527d8..1209925 100644 --- a/ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDK.xcscheme +++ b/ConnectSDK.xcodeproj/xcshareddata/xcschemes/ConnectSDK.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "NO"> @@ -97,15 +97,18 @@ isEnabled = "YES"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -76,15 +76,18 @@ ReferencedContainer = "container:ConnectSDK.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -76,15 +76,18 @@ ReferencedContainer = "container:ConnectSDK.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -76,15 +76,18 @@ ReferencedContainer = "container:ConnectSDK.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> + + Project Settings" and change "Derived Data" to "Project-Relative Location" +* "File -> Add Files to ConnectSDK", and select the "modules" folder +* In project delete "GoogleCastTests" in "google-cast" folder. +* "Build Phases -> Headers", move the headers from private to public + +## GoogleCast.framework + + curl -o modules/google-cast/GoogleCastSDK.zip https://developers.google.com/cast/downloads/GoogleCastSDK-2.7.1-Release-ios-default.zip + unzip modules/google-cast/GoogleCastSDK.zip 'GoogleCastSDK-2.7.1-Release/GoogleCast.framework/*' -d modules/google-cast + +## Xcode +* "Build Phases -> Link Binary With Libraries", add the "GoogleCast.framework" +* Select "Framework" as target and "Generic iOS Device", hit the run button diff --git a/modules/google-cast b/modules/google-cast new file mode 160000 index 0000000..cfd489e --- /dev/null +++ b/modules/google-cast @@ -0,0 +1 @@ +Subproject commit cfd489e9bb1178be16a178e8541ab7a344afe882