Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Commit

Permalink
Merge pull request #196 from Esri/Fixes_for_Sarat
Browse files Browse the repository at this point in the history
ATS and Asset catalog errors are fixed
  • Loading branch information
saratchandrakarumuri authored Jul 19, 2016
2 parents 91c98d6 + c3e853a commit 1674532
Show file tree
Hide file tree
Showing 15 changed files with 473 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,28 @@
"images" : [
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"size" : "57x57",
Expand All @@ -18,69 +38,69 @@
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "72x72"
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "72x72"
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"scale" : "1x",
"size" : "29x29"
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
"idiom" : "ipad",
"size" : "50x50",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "50x50"
"size" : "50x50",
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "50x50"
"size" : "72x72",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
"size" : "72x72",
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>trimarc.org</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
</dict>
</dict>
</dict>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,106 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "icon.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>nationalmap.gov</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
</dict>
</dict>
</dict>
Expand Down
9 changes: 9 additions & 0 deletions SwitchBasemapSample/swift/SwitchBasemap/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>nationalmap.gov</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
</dict>
</dict>
<key>UILaunchStoryboardName</key>
Expand Down
Loading

0 comments on commit 1674532

Please sign in to comment.