2.3 (#150)

replete-repl · Jan 2, 2020 · 42af09b · 42af09b
1 parent 8ba2bff
commit 42af09b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/ClojureScript/replete/deps.edn b/ClojureScript/replete/deps.edn
@@ -1,3 +1,3 @@
-{:deps {org.clojure/clojurescript {:mvn/version "1.10.520"}
+{:deps {org.clojure/clojurescript {:mvn/version "1.10.597"}
         github-replete-repl/replete-shared {:git/url "https://github.com/replete-repl/replete-shared"
-                                            :sha "eda33a0cb206b601acf9a2a0a0202e8b139081b7"}}}
+                                            :sha "d1b30441e34db96f25bd718e9ee1bd15ae54eac4"}}}
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Replete iOS
+# Replete REPL iOS
 
 ClojureScript REPL iOS app.
 
@@ -30,6 +30,6 @@ Happy to take PRs!
 
 # License
 
-Copyright © 2015–2019 Mike Fikes, Roman Liutikov, and Contributors
+Copyright © 2015–2020 Mike Fikes, Roman Liutikov, and Contributors
 
 Distributed under the Eclipse Public License either version 1.0 or (at your option) any later version.
diff --git a/Replete.xcodeproj/project.pbxproj b/Replete.xcodeproj/project.pbxproj
@@ -48,7 +48,7 @@
 /* Begin PBXFileReference section */
 		2B729A836860CF6C7C9AEA5A /* Pods-Replete.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Replete.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Replete/Pods-Replete.debug.xcconfig"; sourceTree = "<group>"; };
 		41F3B6043256B063EF1F8481 /* Pods-Replete.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Replete.release.xcconfig"; path = "Pods/Target Support Files/Pods-Replete/Pods-Replete.release.xcconfig"; sourceTree = "<group>"; };
-		ED06DC211B3F62E800100331 /* Replete.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Replete.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED06DC211B3F62E800100331 /* Replete REPL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Replete REPL.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		ED06DC251B3F62E800100331 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		ED06DC261B3F62E800100331 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		ED06DC281B3F62E800100331 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -156,7 +156,7 @@
 		ED06DC221B3F62E800100331 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				ED06DC211B3F62E800100331 /* Replete.app */,
+				ED06DC211B3F62E800100331 /* Replete REPL.app */,
 				ED06DC3A1B3F62E800100331 /* RepleteTests.xctest */,
 			);
 			name = Products;
@@ -241,7 +241,7 @@
 			);
 			name = Replete;
 			productName = Replete;
-			productReference = ED06DC211B3F62E800100331 /* Replete.app */;
+			productReference = ED06DC211B3F62E800100331 /* Replete REPL.app */;
 			productType = "com.apple.product-type.application";
 		};
 		ED06DC391B3F62E800100331 /* RepleteTests */ = {
@@ -528,8 +528,9 @@
 					"$(PROJECT_DIR)/Replete/openssl/iOS/lib",
 					"$(PROJECT_DIR)/Replete/nghttp2/lib",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.fikesfarm.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				MARKETING_VERSION = 2.3;
+				PRODUCT_BUNDLE_IDENTIFIER = com.fikesfarm.Replete;
+				PRODUCT_NAME = "Replete REPL";
 				SWIFT_OBJC_BRIDGING_HEADER = "Replete/Replete-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -555,8 +556,9 @@
 					"$(PROJECT_DIR)/Replete/openssl/iOS/lib",
 					"$(PROJECT_DIR)/Replete/nghttp2/lib",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.fikesfarm.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				MARKETING_VERSION = 2.3;
+				PRODUCT_BUNDLE_IDENTIFIER = com.fikesfarm.Replete;
+				PRODUCT_NAME = "Replete REPL";
 				SWIFT_OBJC_BRIDGING_HEADER = "Replete/Replete-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;

diff --git a/Replete/Info.plist b/Replete/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -29,12 +31,10 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleDisplayName</key>
-	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>