Merge pull request #81 from melton-foundation/pranav_beta_fixes

fix,chore: iOS non-Safari default browser bug, prepare release v1.1.1+4
melton-foundation · Nov 13, 2020 · 77dae51 · 77dae51
2 parents 5d9a50f + 5b72082
commit 77dae51
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/docs/images/directory_1.png b/docs/images/directory_1.png
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -386,7 +386,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = PN7FU82PWA;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -402,7 +402,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.meltonApp;
 				PRODUCT_NAME = "Melton App";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -529,7 +529,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = PN7FU82PWA;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -545,7 +545,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.meltonApp;
 				PRODUCT_NAME = "Melton App";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -566,7 +566,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = PN7FU82PWA;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -582,7 +582,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.meltonApp;
 				PRODUCT_NAME = "Melton App";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,12 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>https</string>
+		<string>http</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:get_it/get_it.dart';
-import 'package:melton_app/Notification/NotificationBuilder.dart';
+import 'package:melton_app/notification/notification_builder.dart';
 import 'package:melton_app/models/PostsNotificationModel.dart';
 import 'package:melton_app/sentry/SentryService.dart';
 import 'package:melton_app/util/token_handler.dart';

diff --git a/lib/Notification/NotificationBuilder.dart → lib/notification/notification_builder.dart b/lib/Notification/NotificationBuilder.dart → lib/notification/notification_builder.dart
diff --git a/lib/screens/directory.dart b/lib/screens/directory.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:melton_app/Notification/NotificationBuilder.dart';
+import 'package:melton_app/notification/notification_builder.dart';
 import 'package:melton_app/api/userSearchService.dart';
 import 'package:melton_app/constants/constants.dart';
 import 'package:melton_app/screens/DirectoryComponents/UserSearch.dart';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: App for Melton Foundation Fellows - https://meltonapp.com/
 
 publish_to: 'none'
 
-version: 1.1.0+3
+version: 1.1.1+4
 
 environment:
   sdk: ">=2.7.0 <3.0.0"