From 055670d135454c7249536d6797cb9f264dc1e792 Mon Sep 17 00:00:00 2001
From: Nathan Fallet <contact@nathanfallet.me>
Date: Tue, 4 May 2021 16:23:54 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Ready=20for=20App=20Store=20v1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCaml.xcodeproj/project.pbxproj          |  8 ++++----
 Shared/Extensions/ViewExtension.swift    |  3 ++-
 Shared/Views/Settings/SettingsView.swift | 18 ++++++++----------
 iOS/Info.plist                           |  6 +++---
 macOS/Info.plist                         |  4 +++-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/OCaml.xcodeproj/project.pbxproj b/OCaml.xcodeproj/project.pbxproj
index e819e53..3a643c1 100644
--- a/OCaml.xcodeproj/project.pbxproj
+++ b/OCaml.xcodeproj/project.pbxproj
@@ -615,7 +615,7 @@
 				CODE_SIGN_ENTITLEMENTS = Shared/OCaml.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 115;
 				DEVELOPMENT_TEAM = ZL9396WK65;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = iOS/Info.plist;
@@ -643,7 +643,7 @@
 				CODE_SIGN_ENTITLEMENTS = Shared/OCaml.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 115;
 				DEVELOPMENT_TEAM = ZL9396WK65;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = iOS/Info.plist;
@@ -673,7 +673,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 115;
 				DEVELOPMENT_TEAM = ZL9396WK65;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -702,7 +702,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 115;
 				DEVELOPMENT_TEAM = ZL9396WK65;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
diff --git a/Shared/Extensions/ViewExtension.swift b/Shared/Extensions/ViewExtension.swift
index 6511720..aa0708c 100644
--- a/Shared/Extensions/ViewExtension.swift
+++ b/Shared/Extensions/ViewExtension.swift
@@ -50,7 +50,8 @@ extension View {
 #if os(macOS)
 extension NSTextField {
     open override var focusRingType: NSFocusRingType {
-        .none
+        get { .none }
+        set { super.focusRingType = newValue }
     }
 }
 #endif
diff --git a/Shared/Views/Settings/SettingsView.swift b/Shared/Views/Settings/SettingsView.swift
index 4f83b02..f431317 100644
--- a/Shared/Views/Settings/SettingsView.swift
+++ b/Shared/Views/Settings/SettingsView.swift
@@ -59,18 +59,16 @@ struct SettingsView: View {
                             openURL(url)
                         }
                     }
-                Text("App Store")
-                    .onTapGesture {
-                        if let url = URL(string: "https://apps.apple.com/app/ocaml-learn-code/id1547506826") {
-                            openURL(url)
-                        }
+                Button("App Store") {
+                    if let url = URL(string: "https://apps.apple.com/app/ocaml-learn-code/id1547506826") {
+                        openURL(url)
                     }
-                Text("TestFlight")
-                    .onTapGesture {
-                        if let url = URL(string: "https://testflight.apple.com/join/xDGBk6wD") {
-                            openURL(url)
-                        }
+                }
+                Button("TestFlight") {
+                    if let url = URL(string: "https://testflight.apple.com/join/xDGBk6wD") {
+                        openURL(url)
                     }
+                }
                 NavigationLink(destination: OpenSourceView()) {
                     Text("opensource")
                 }
diff --git a/iOS/Info.plist b/iOS/Info.plist
index 299539b..13192aa 100644
--- a/iOS/Info.plist
+++ b/iOS/Info.plist
@@ -43,7 +43,9 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
@@ -101,7 +103,5 @@
 			</dict>
 		</dict>
 	</array>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 </dict>
 </plist>
diff --git a/macOS/Info.plist b/macOS/Info.plist
index bae19af..c4fc084 100644
--- a/macOS/Info.plist
+++ b/macOS/Info.plist
@@ -45,7 +45,9 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSSupportsOpeningDocumentsInPlace</key>