Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop minimum OS requirements to minimum currently supported by Apple #333

Merged
merged 7 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Release Notes

### Unreleased

- Dropped minimum deployable OS requirements to iOS 11, macOS 10.13, tvOS 11, and watchOS 4.

### 3.1.1

- Fixed archiving issue when integrating the SDK using Cocoapods.
Expand Down
20 changes: 17 additions & 3 deletions Examples/RollbarDemo/RollbarDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
3B810F452A7B2D10001A3D29 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B810F442A7B2D10001A3D29 /* LaunchScreen.storyboard */; };
3BAD89E12A699BD300713F26 /* RollbarDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BAD89E02A699BD300713F26 /* RollbarDemoApp.swift */; };
3BAD89E32A699BD300713F26 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BAD89E22A699BD300713F26 /* ContentView.swift */; };
3BAD89E52A699BD400713F26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3BAD89E42A699BD400713F26 /* Assets.xcassets */; };
Expand All @@ -16,6 +17,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
3B810F442A7B2D10001A3D29 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
3BAD89DD2A699BD300713F26 /* RollbarDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RollbarDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
3BAD89E02A699BD300713F26 /* RollbarDemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RollbarDemoApp.swift; sourceTree = "<group>"; };
3BAD89E22A699BD300713F26 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -57,10 +59,11 @@
3BAD89DF2A699BD300713F26 /* RollbarDemo */ = {
isa = PBXGroup;
children = (
3BAD89E62A699BD400713F26 /* RollbarDemo.entitlements */,
3BAD89E02A699BD300713F26 /* RollbarDemoApp.swift */,
3BAD89E22A699BD300713F26 /* ContentView.swift */,
3BAD89EF2A699F9E00713F26 /* Prelude.swift */,
3B810F442A7B2D10001A3D29 /* LaunchScreen.storyboard */,
3BAD89E62A699BD400713F26 /* RollbarDemo.entitlements */,
3BAD89E42A699BD400713F26 /* Assets.xcassets */,
3BAD89E72A699BD400713F26 /* Preview Content */,
);
Expand Down Expand Up @@ -143,6 +146,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3B810F452A7B2D10001A3D29 /* LaunchScreen.storyboard in Resources */,
3BAD89E92A699BD400713F26 /* Preview Assets.xcassets in Resources */,
3BAD89E52A699BD400713F26 /* Assets.xcassets in Resources */,
);
Expand Down Expand Up @@ -197,6 +201,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -255,6 +260,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -281,14 +287,18 @@
CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 70;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\"";
DEVELOPMENT_TEAM = 9P5JVC2F34;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_CFBundleDisplayName = "Rollbar Demo";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UIRequiresFullScreen = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo;
Expand All @@ -311,14 +321,18 @@
CODE_SIGN_ENTITLEMENTS = RollbarDemo/RollbarDemo.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 70;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"RollbarDemo/Preview Content\"";
DEVELOPMENT_TEAM = 9P5JVC2F34;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_CFBundleDisplayName = "Rollbar Demo";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UIRequiresFullScreen = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.apple.demo;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3BAD89DC2A699BD300713F26"
BuildableName = "RollbarDemo.app"
BlueprintName = "RollbarDemo"
ReferencedContainer = "container:RollbarDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3BAD89DC2A699BD300713F26"
BuildableName = "RollbarDemo.app"
BlueprintName = "RollbarDemo"
ReferencedContainer = "container:RollbarDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3BAD89DC2A699BD300713F26"
BuildableName = "RollbarDemo.app"
BlueprintName = "RollbarDemo"
ReferencedContainer = "container:RollbarDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
3 changes: 1 addition & 2 deletions Examples/RollbarDemo/RollbarDemo/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ struct ContentView: View {

func button(_ title: String, action: @escaping () -> ()) -> some View {
Button(title, action: action)
.buttonStyle(.bordered)
.tint(.blue)
.frame(height: 24.0)
}

func accessTokenIsValid(_ accessToken: String) -> Bool {
Expand Down
40 changes: 40 additions & 0 deletions Examples/RollbarDemo/RollbarDemo/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="0.0" y="832" width="393" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
21 changes: 6 additions & 15 deletions Examples/RollbarDemo/RollbarDemo/RollbarDemoApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,10 @@ import RollbarNotifier

@main
struct RollbarDemoApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate

var body: some Scene {
WindowGroup {
ContentView()
}
}
}

class AppDelegate: NSObject, UIApplicationDelegate {
@AppStorage("rollbar_endpoint") var endpoint = "https://api.rollbar.com/api/1/item/"
@AppStorage("rollbar_post_client_item_access_token") var accessToken = ""

func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil
) -> Bool {
init() {
// Dynamically read these settings from your config settings on application startup.
let accessToken = self.accessToken // Rollbar post_client_item access token
let environment = "staging"
Expand Down Expand Up @@ -68,8 +55,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {

// Initialize a Rollbar shared instance with a crash collector
Rollbar.initWithConfiguration(config)
}

return true
var body: some Scene {
WindowGroup {
ContentView()
}
}
}

Expand Down
12 changes: 2 additions & 10 deletions Examples/RollbarObjCDemo/RollbarObjCDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
3BDB825A292D67900093AC9D /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BDB8258292D67900093AC9D /* SceneDelegate.m */; };
55684F702553B4C400F82F34 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F6F2553B4C400F82F34 /* AppDelegate.m */; };
55684F762553B4C400F82F34 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F752553B4C400F82F34 /* ViewController.m */; };
55684F792553B4C400F82F34 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 55684F772553B4C400F82F34 /* Main.storyboard */; };
Expand All @@ -19,9 +18,6 @@

/* Begin PBXFileReference section */
3B1DED342A6846A0003936E7 /* RollbarObjCDemo.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = RollbarObjCDemo.entitlements; sourceTree = "<group>"; };
3BDB8258292D67900093AC9D /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
3BDB8259292D67900093AC9D /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
3BDB825B292E34990093AC9D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
55684F6B2553B4C400F82F34 /* RollbarObjCDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RollbarObjCDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
55684F6E2553B4C400F82F34 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
55684F6F2553B4C400F82F34 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -69,15 +65,12 @@
55684F6E2553B4C400F82F34 /* AppDelegate.h */,
55684F6F2553B4C400F82F34 /* AppDelegate.m */,
55684F802553B4C700F82F34 /* main.m */,
3BDB8259292D67900093AC9D /* SceneDelegate.h */,
3BDB8258292D67900093AC9D /* SceneDelegate.m */,
55684F742553B4C400F82F34 /* ViewController.h */,
55684F752553B4C400F82F34 /* ViewController.m */,
55684F7C2553B4C700F82F34 /* LaunchScreen.storyboard */,
55684F772553B4C400F82F34 /* Main.storyboard */,
3B1DED342A6846A0003936E7 /* RollbarObjCDemo.entitlements */,
55684F7A2553B4C700F82F34 /* Assets.xcassets */,
3BDB825B292E34990093AC9D /* Info.plist */,
);
path = RollbarObjCDemo;
sourceTree = "<group>";
Expand Down Expand Up @@ -166,7 +159,6 @@
55684F762553B4C400F82F34 /* ViewController.m in Sources */,
55684F702553B4C400F82F34 /* AppDelegate.m in Sources */,
55684F812553B4C700F82F34 /* main.m in Sources */,
3BDB825A292D67900093AC9D /* SceneDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -318,7 +310,6 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = 9P5JVC2F34;
INFOPLIST_FILE = RollbarObjCDemo/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Rollbar ObjC Demo";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -327,6 +318,7 @@
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
INFOPLIST_KEY_UIRequiresFullScreen = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -349,7 +341,6 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = 9P5JVC2F34;
INFOPLIST_FILE = RollbarObjCDemo/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Rollbar ObjC Demo";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -358,6 +349,7 @@
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
INFOPLIST_KEY_UIRequiresFullScreen = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
2 changes: 2 additions & 0 deletions Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@

@interface AppDelegate : UIResponder <UIApplicationDelegate>

@property (nullable, nonatomic, strong) UIWindow *window;

@end

11 changes: 0 additions & 11 deletions Examples/RollbarObjCDemo/RollbarObjCDemo/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,4 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
return YES;
}

#pragma mark - UISceneSession lifecycle

- (UISceneConfiguration *) application:(UIApplication *)application
configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession
options:(UISceneConnectionOptions *)options {
// Called when a new scene session is being created.
// Use this method to select a configuration to create the new scene with.
return [[UISceneConfiguration alloc] initWithName:@"Default Configuration"
sessionRole:connectingSceneSession.role];
}

@end
Loading