Skip to content

Commit

Permalink
Revert "Merge pull request #590 from redcapua/update-to-Swift-4.2"
Browse files Browse the repository at this point in the history 
This reverts commit 9540ac1, reversing
changes made to ef448ff.

Change-Id: I8dc55a78a788b72f3e4047df5feb6343e79a25ee
  • Loading branch information
@morganchen12
morganchen12 committed Dec 3, 2018
1 parent 0cc8069 commit 4dedb09
Show file tree
Hide file tree
Showing 49 changed files with 197 additions and 515 deletions.
27 changes: 12 additions & 15 deletions abtesting/ABTestingExample.xcodeproj/project.pbxproj
View file
Expand Up @@ -193,18 +193,17 @@
TargetAttributes = {
10B92C9B202E3603008DBD68 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 8DFFBF991F9E6C5200C3483E;
};
8DFFBF991F9E6C5200C3483E = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 1010;
LastSwiftMigration = 0930;
ProvisioningStyle = Automatic;
};
8DFFBFAD1F9E6C5200C3483E = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 1010;
LastSwiftMigration = 0930;
ProvisioningStyle = Automatic;
TestTargetID = 8DFFBF991F9E6C5200C3483E;
};
Expand Down Expand Up @@ -331,14 +330,13 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ABTestingExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExample.ABTestingExampleUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = ABTestingExample;
};
Expand All @@ -357,14 +355,13 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ABTestingExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExample.ABTestingExampleUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = ABTestingExample;
};
Expand Down Expand Up @@ -486,12 +483,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ABTestingExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PODS_CONFIGURATION_BUILD_DIR)/GoogleToolboxForMac $(PODS_CONFIGURATION_BUILD_DIR)/nanopb $(PODS_CONFIGURATION_BUILD_DIR)/Protobuf";
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -500,12 +497,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ABTestingExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PODS_CONFIGURATION_BUILD_DIR)/GoogleToolboxForMac $(PODS_CONFIGURATION_BUILD_DIR)/nanopb $(PODS_CONFIGURATION_BUILD_DIR)/Protobuf";
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -514,12 +511,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ABTestingExampleTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ABTestingExample.app/ABTestingExample";
};
name = Debug;
Expand All @@ -529,12 +526,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ABTestingExampleTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ABTestingExample.app/ABTestingExample";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion abtesting/ABTestingExample/AppDelegate.swift
View file
Expand Up @@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
FirebaseApp.configure()
return true
}
Expand Down
13 changes: 4 additions & 9 deletions abtesting/ABTestingExample/ViewController.swift
View file
Expand Up @@ -87,13 +87,8 @@ class ViewController: UIViewController, UITableViewDataSource {
}

@objc func printInstanceIDToken() {
InstanceID.instanceID().instanceID { (result, error) in
if let error = error {
print("Error fetching remote instange ID: \(error)")
} else if let result = result {
print("Remote instance ID token: \(result.token)")
}
}
let instanceID = InstanceID.instanceID().token() ?? "null"
print("InstanceID token: \(instanceID)")
}

deinit {
Expand All @@ -109,7 +104,7 @@ class ViewController: UIViewController, UITableViewDataSource {
navigationController?.navigationBar.barTintColor = ViewController.lightColors.primary
navigationController?.navigationBar.barStyle = .`default`
navigationController?.navigationBar.titleTextAttributes = [
NSAttributedString.Key.foregroundColor: UIColor.black
NSAttributedStringKey.foregroundColor: UIColor.black
]
tableView.separatorColor = .gray
tableView.backgroundColor = UIColor(red: 0.94, green: 0.94, blue: 0.94, alpha: 1)
Expand All @@ -118,7 +113,7 @@ class ViewController: UIViewController, UITableViewDataSource {
navigationController?.navigationBar.barTintColor = ViewController.darkColors.primary
navigationController?.navigationBar.barStyle = .black
navigationController?.navigationBar.titleTextAttributes = [
NSAttributedString.Key.foregroundColor: UIColor.white
NSAttributedStringKey.foregroundColor: UIColor.white
]
tableView.separatorColor = .lightGray
tableView.backgroundColor = ViewController.darkColors.secondary
Expand Down
58 changes: 24 additions & 34 deletions admob/AdMobExample.xcodeproj/project.pbxproj
View file
Expand Up @@ -8,7 +8,9 @@

/* Begin PBXBuildFile section */
1021DD271B05187A0018763B /* AdMobExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1021DD261B05187A0018763B /* AdMobExampleTests.m */; };
1048165C1B067ACD00139095 /* AdMobExampleSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1021DD351B0518E40018763B /* AdMobExampleSwiftTests.swift */; };
1048165E1B068A0300139095 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CF86EE2419787E6B00411520 /* Main.storyboard */; };
104816601B068FC100139095 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 105919B41ADDA93F00344065 /* ViewController.swift */; };
105414A31B163EB20006C828 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1054149F1B163EB20006C828 /* Images.xcassets */; };
105414A41B163EB20006C828 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1054149F1B163EB20006C828 /* Images.xcassets */; };
105414A51B163EB20006C828 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 105414A01B163EB20006C828 /* LaunchScreen.xib */; };
Expand All @@ -22,7 +24,6 @@
CF86EE2019787E6B00411520 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CF86EE1F19787E6B00411520 /* AppDelegate.m */; };
CF86EE2319787E6B00411520 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CF86EE2219787E6B00411520 /* ViewController.m */; };
CF86EE2619787E6B00411520 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CF86EE2419787E6B00411520 /* Main.storyboard */; };
F54EB9CA21ADF3DC002A1D71 /* AdMobExampleSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1021DD351B0518E40018763B /* AdMobExampleSwiftTests.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -378,18 +379,16 @@
};
1021DD301B0518E40018763B = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 1010;
LastSwiftMigration = 0930;
ProvisioningStyle = Automatic;
TestTargetID = 105919891ADDA8F700344065;
};
105919891ADDA8F700344065 = {
CreatedOnToolsVersion = 6.2;
LastSwiftMigration = 1010;
LastSwiftMigration = 0930;
ProvisioningStyle = Automatic;
};
107346B9203157F4004A66D1 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 105919891ADDA8F700344065;
};
Expand Down Expand Up @@ -492,7 +491,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F54EB9CA21ADF3DC002A1D71 /* AdMobExampleSwiftTests.swift in Sources */,
104816601B068FC100139095 /* ViewController.swift in Sources */,
1048165C1B067ACD00139095 /* AdMobExampleSwiftTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -620,12 +620,13 @@
1021DD3A1B0518E40018763B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -634,44 +635,37 @@
INFOPLIST_FILE = AdMobExampleSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Google-Mobile-Ads-SDK/Libraries\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.quickstart.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AdMobExampleSwift.app/AdMobExampleSwift";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
1021DD3B1B0518E40018763B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = AdMobExampleSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Google-Mobile-Ads-SDK/Libraries\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.quickstart.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AdMobExampleSwift.app/AdMobExampleSwift";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -694,7 +688,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -713,7 +708,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.AdMobExample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -728,16 +724,14 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AdMobExampleSwiftUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)/**";
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.AdMobExampleSwiftUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = AdMobExampleSwift;
};
Expand All @@ -755,15 +749,13 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AdMobExampleSwiftUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)/**";
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.AdMobExampleSwiftUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = AdMobExampleSwift;
};
Expand All @@ -780,7 +772,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AdMobExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
Expand All @@ -804,7 +795,6 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AdMobExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
Expand Down
2 changes: 1 addition & 1 deletion admob/AdMobExampleSwift/AppDelegate.swift
View file
Expand Up @@ -26,7 +26,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Use Firebase library to configure APIs
FirebaseApp.configure()
return true
Expand Down

0 comments on commit 4dedb09

Please sign in to comment.