Skip to content

Commit

Permalink
Merge pull request #96 from Esri/v.next
Browse files Browse the repository at this point in the history
Release 1.1.4
  • Loading branch information
esreli committed Mar 10, 2020
2 parents 7f8e198 + 5b47bdc commit b74df2a
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Before running the app, it must be configured with application credentials. Foll
2. Configure the Mapbook App project to reference that application.
3. License the app to remove the Developer Mode watermark.

#### 1. Register an Application
#### 1. Register an Application
For OAuth configuration, create a new Application in your ArcGIS Portal to obtain a `Client ID` and configure a `Redirect URL`. The **Client ID** configures the ArcGIS Runtime to show your users, during the log in process, that the application was built by you and can be trusted. The **Redirect URL** configures the OAuth process to then return to your app once authentication is complete.

1. Log in to [https://developers.arcgis.com](https://developers.arcgis.com) with either your ArcGIS Organizational Account or an ArcGIS Developer Account.
Expand Down Expand Up @@ -86,7 +86,7 @@ This step is optional during development, but required for deployment.
3. Set the value of the static variable `licenseKey` to the value from step 1.

## Learn More
Learn more about the App Architecture and usage [here](https://github.com/ArcGIS/mapbook-ios/tree/dop/update-readme/mapbook-iOS).
Learn more about the App Architecture and usage [here](/docs/index.md).

## Requirements
* [Xcode 11](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) with Swift 5
Expand Down
7 changes: 7 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# v1.1.4

* Fixes featureLayer deprecation.
* Updates minimum deployment target to match that supported by ArcGIS iOS Runtime SDK.
* Turns off metal validation -> fixes iOS 12 device crash.
* New bundle ID.

# v1.1.3

* Certification for the 100.7.0 release of the ArcGIS Runtime SDK for iOS.
Expand Down
14 changes: 6 additions & 8 deletions mapbook-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -485,7 +485,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -504,11 +504,10 @@
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = $HOME/Library/SDKs/ArcGIS/iOS/Frameworks/Dynamic/;
INFOPLIST_FILE = "mapbook-iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.1.4;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgisruntime-example-apps.mapbook";
PRODUCT_BUNDLE_IDENTIFIER = com.esri.arcgisruntime.opensourceapps.mapbook;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "mapbook-iOS/mapbook-iOSBridgingHeader.h";
Expand All @@ -526,11 +525,10 @@
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = $HOME/Library/SDKs/ArcGIS/iOS/Frameworks/Dynamic/;
INFOPLIST_FILE = "mapbook-iOS/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.1.4;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgisruntime-example-apps.mapbook";
PRODUCT_BUNDLE_IDENTIFIER = com.esri.arcgisruntime.opensourceapps.mapbook;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "mapbook-iOS/mapbook-iOSBridgingHeader.h";
Expand Down
79 changes: 79 additions & 0 deletions mapbook-iOS.xcodeproj/xcshareddata/xcschemes/mapbook-iOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3EDC84451F1E8B94002DBCF2"
BuildableName = "mapbook-iOS.app"
BlueprintName = "mapbook-iOS"
ReferencedContainer = "container:mapbook-iOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3EDC84451F1E8B94002DBCF2"
BuildableName = "mapbook-iOS.app"
BlueprintName = "mapbook-iOS"
ReferencedContainer = "container:mapbook-iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3EDC84451F1E8B94002DBCF2"
BuildableName = "mapbook-iOS.app"
BlueprintName = "mapbook-iOS"
ReferencedContainer = "container:mapbook-iOS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion mapbook-iOS/View controllers/MapViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ extension MapViewController:AGSPopupsViewControllerDelegate {
return
}

feature.featureTable?.featureLayer?.select(feature)
(feature.featureTable?.layer as? AGSFeatureLayer)?.select(feature)
}
}

Expand Down

0 comments on commit b74df2a

Please sign in to comment.