Skip to content
This repository has been archived by the owner on Feb 25, 2025. It is now read-only.

Commit

Permalink
Merge pull request #136 from chinmaygarde/mac
Browse files Browse the repository at this point in the history
Use "org.domokit" in Sky shell iOS
  • Loading branch information
chinmaygarde committed Jul 20, 2015
2 parents e62f51a + 72032a6 commit c2b57f5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 26 deletions.
14 changes: 10 additions & 4 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
group("default") {
testonly = true

deps = [
"//sky",
"//services/sky",
]
if (is_ios || is_mac) {
deps = [
"//sky/shell",

This comment has been minimized.

Copy link
@Hixie

Hixie Jul 21, 2015

Contributor

can you add a comment explaining why Mac and iOS are different than other platforms here?

]
} else {
deps = [
"//sky",
"//services/sky",
]
}
}
4 changes: 2 additions & 2 deletions sky/shell/ios/Entitlements.xcent
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<plist version="1.0">
<dict>
<key>application-identifier</key>
<string>F5T262WGN6.com.google.sky</string>
<string>F5T262WGN6.org.domokit.sky</string>
<key>com.apple.developer.team-identifier</key>
<string>F5T262WGN6</string>
<key>get-task-allow</key>
<true/>
<key>keychain-access-groups</key>
<array>
<string>F5T262WGN6.com.google.sky</string>
<string>F5T262WGN6.org.domokit.sky</string>
</array>
</dict>
</plist>
21 changes: 2 additions & 19 deletions sky/shell/ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<string>Sky</string>

<key>CFBundleIdentifier</key>
<string>com.google.sky</string>
<string>org.domokit.sky</string>

<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
Expand All @@ -32,27 +32,10 @@
<string>armv7</string>
</array>

<!--
mojo:// URL handlers
-->
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleURLName</key>
<string>com.google.mojo</string>
<key>CFBundleURLSchemes</key>
<array>
<string>mojo</string>
</array>
</dict>
</array>

<!--
Sky Load URL
-->
<key>com.google.sky.load_url</key>
<key>org.domokit.sky.load_url</key>
<string>https://domokit.github.io/home.dart</string>

<!--
Expand Down
2 changes: 1 addition & 1 deletion sky/shell/ios/sky_surface.mm
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ - (void)notifySurfaceCreation {
}

- (NSString*)skyInitialLoadURL {
return [NSBundle mainBundle].infoDictionary[@"com.google.sky.load_url"];
return [NSBundle mainBundle].infoDictionary[@"org.domokit.sky.load_url"];
}

- (void)connectToEngineAndLoad {
Expand Down

0 comments on commit c2b57f5

Please sign in to comment.