Updated for version 3.5 of the Adonit iOS SDK.

Adonit · Aug 3, 2018 · 258788d · 258788d
1 parent 8844c00
commit 258788d
Show file tree

Hide file tree

Showing 29 changed files with 23 additions and 18 deletions.
diff --git a/AdonitSDK.bundle/DebugOptionsTableViewCell.nib b/AdonitSDK.bundle/DebugOptionsTableViewCell.nib
diff --git a/AdonitSDK.bundle/Info.plist b/AdonitSDK.bundle/Info.plist
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/DebugStatusViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/DebugStatusViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/FPM-bZ-AqB-view-Xvj-0Q-ooG.nib b/AdonitSDK.bundle/JotSettings.storyboardc/FPM-bZ-AqB-view-Xvj-0Q-ooG.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/Info.plist b/AdonitSDK.bundle/JotSettings.storyboardc/Info.plist
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotBatteryViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotBatteryViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotConnectedViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotConnectedViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotConnectionStatusViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotConnectionStatusViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotDisconnectedViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotDisconnectedViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotPressToConnectViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotPressToConnectViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotShortButtonsTableViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotShortButtonsTableViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotStylusDetailTableViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotStylusDetailTableViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/JotWritingStyleViewController.nib b/AdonitSDK.bundle/JotSettings.storyboardc/JotWritingStyleViewController.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/Kai-kc-1UU-view-mH9-9p-q6X.nib b/AdonitSDK.bundle/JotSettings.storyboardc/Kai-kc-1UU-view-mH9-9p-q6X.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/UINavigationController-WQh-qr-84m.nib b/AdonitSDK.bundle/JotSettings.storyboardc/UINavigationController-WQh-qr-84m.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/YyA-YT-yNg-view-daT-lA-OZj.nib b/AdonitSDK.bundle/JotSettings.storyboardc/YyA-YT-yNg-view-daT-lA-OZj.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/dtB-tO-xBf-view-2bn-E7-7yp.nib b/AdonitSDK.bundle/JotSettings.storyboardc/dtB-tO-xBf-view-2bn-E7-7yp.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/mrx-Gs-5KW-view-vOb-Vy-utL.nib b/AdonitSDK.bundle/JotSettings.storyboardc/mrx-Gs-5KW-view-vOb-Vy-utL.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/oxC-0N-u0H-view-NZH-Vd-sUJ.nib b/AdonitSDK.bundle/JotSettings.storyboardc/oxC-0N-u0H-view-NZH-Vd-sUJ.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/p4f-Rj-cqB-view-iYF-un-vxo.nib b/AdonitSDK.bundle/JotSettings.storyboardc/p4f-Rj-cqB-view-iYF-un-vxo.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/s6B-Kb-hQX-view-S2f-BN-84O.nib b/AdonitSDK.bundle/JotSettings.storyboardc/s6B-Kb-hQX-view-S2f-BN-84O.nib
diff --git a/AdonitSDK.bundle/JotSettings.storyboardc/zQv-SI-wo7-view-zzO-wF-Psq.nib b/AdonitSDK.bundle/JotSettings.storyboardc/zQv-SI-wo7-view-zzO-wF-Psq.nib
diff --git a/AdonitSDK.framework/Versions/A/AdonitSDK b/AdonitSDK.framework/Versions/A/AdonitSDK
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,10 @@
 #Change Log for AdonitSDK (iOS)
 
+#v3.5
+
+**SDK**
+- Fix duplicate symbols incompatible with beta 5 of Xcode 10.
+
 #v3.4.3
 
 **SDK**

diff --git a/JotTouchExample/JotTouchExample.xcodeproj/project.pbxproj b/JotTouchExample/JotTouchExample.xcodeproj/project.pbxproj
@@ -473,7 +473,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "KEYWORDS=\"TODO:|FIXME:|\\?\\?\\?:|\\!\\!\\!:\"\nfind \"${SRCROOT}\" \\( -name \"*.h\" -or -name \"*.m\" \\) -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($KEYWORDS).*\\$\" | perl -p -e \"s/($KEYWORDS)/ warning: \\$1/\"";
+			shellScript = "KEYWORDS=\"TODO:|FIXME:|\\?\\?\\?:|\\!\\!\\!:\"\nfind \"${SRCROOT}\" \\( -name \"*.h\" -or -name \"*.m\" \\) -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($KEYWORDS).*\\$\" | perl -p -e \"s/($KEYWORDS)/ warning: \\$1/\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/JotTouchExample/JotTouchExample/Info.plist b/JotTouchExample/JotTouchExample/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>41</string>
+	<string>44</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/JotTouchExample/JotTouchExample/MainStoryboard.storyboard b/JotTouchExample/JotTouchExample/MainStoryboard.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HQy-ax-ZsY">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HQy-ax-ZsY">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
@@ -1652,7 +1652,7 @@
                                         </constraints>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hold Tip Here" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="9" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nGT-Ug-IHH">
-                                        <rect key="frame" x="110" y="40" width="153" height="21"/>
+                                        <rect key="frame" x="110" y="40.5" width="153" height="20.5"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="153" id="Dc6-wL-3ou"/>
                                         </constraints>

diff --git a/JotTouchExample/JotTouchExample/ViewController.m b/JotTouchExample/JotTouchExample/ViewController.m
@@ -244,15 +244,15 @@ - (void)setupShortcut
                                                                 ]];
 
     [self.jotManager addShortcutOptionButton2DoubleTapDefault: [[JotShortcut alloc]
-                                                                initWithDescriptiveText:@"Quick Undo/Redo"
-                                                                key:@"quickundoredo"
-                                                                target:self selector:@selector(quickUndoRedo)
+                                                                initWithDescriptiveText:@"Tools"
+                                                                key:@"tools"
+                                                                target:self selector:@selector(toolsSelect)
                                                                 ]];
 
     [self.jotManager addScrollShortcutOption: [[JotShortcut alloc]
-                                               initWithDescriptiveText:@"Tools"
-                                               key:@"tools"
-                                               target:self selector:@selector(toolsSelect)
+                                               initWithDescriptiveText:@"Quick Undo/Redo"
+                                               key:@"quickundoredo"
+                                               target:self selector:@selector(quickUndoRedo)
                                                ]];
 
     [self.jotManager addScrollShortcutOption: [[JotShortcut alloc]
@@ -292,15 +292,15 @@ - (void)addShortcuts
                                                                 ]];
 
     [self.jotManager addScrollShortcutOption: [[JotShortcut alloc]
-                                                                initWithDescriptiveText:@"Quick Undo/Redo"
-                                                                key:@"quickundoredo"
-                                                                target:self selector:@selector(quickUndoRedo)
+                                                                initWithDescriptiveText:@"Tools"
+                                                                key:@"tools"
+                                                                target:self selector:@selector(toolsSelect)
                                                                 ]];
 
     [self.jotManager addScrollShortcutOption: [[JotShortcut alloc]
-                                               initWithDescriptiveText:@"Tools"
-                                               key:@"tools"
-                                               target:self selector:@selector(toolsSelect)
+                                               initWithDescriptiveText:@"Quick Undo/Redo"
+                                               key:@"quickundoredo"
+                                               target:self selector:@selector(quickUndoRedo)
                                                ]];
 
     [self.jotManager addScrollShortcutOption: [[JotShortcut alloc]

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-#Adonit SDK for iOS v3.4.3
+#Adonit SDK for iOS v3.5
 
 ##Overview
 The Adonit iOS SDK is a free framework for iOS that provides you with the necessary tools to integrate a complete sketching experience in your apps when used with Adonit's line of [Bluetooth connected styluses](http://adonit.net/jot). It includes support for for the following features: