iOS: fix version and recurrentRule AppStore submit issues

ccxuy · Nov 18, 2013 · 6267568 · 6267568
1 parent e7a7d6e
commit 6267568
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/platform/iphone/Classes/Event/Event.m b/platform/iphone/Classes/Event/Event.m
@@ -221,11 +221,6 @@ static VALUE eventToRuby(EKEvent *event)
             }
         }
     }
-    else {
-        rule = [event recurrenceRule];
-    }
-#else
-    rule = [event recurrenceRule];
 #endif
     if (rule != nil) {
 
@@ -353,11 +348,6 @@ static VALUE eventToRuby(EKEvent *event)
         if ([event respondsToSelector:@selector(addRecurrenceRule:)]) {
             [event addRecurrenceRule:rule];
         }
-        else {
-            [event setRecurrenceRule:rule];
-        }
-#else
-        [event setRecurrenceRule:rule];
 #endif
 
         if (recurrenceEnd != nil)
@@ -426,12 +416,7 @@ VALUE event_fetch(VALUE rParams)
                 hasRecurRules = YES;
             }
         }
-        else {
-            hasRecurRules = [event recurrenceRule] != nil;
-        }
-#else
-        hasRecurRules = [event recurrenceRule] != nil;
-#endif        
+#endif
 
         if (!include_repeating && hasRecurRules)
             continue;

diff --git a/platform/iphone/Info.plist b/platform/iphone/Info.plist
@@ -55,8 +55,10 @@
 			</array>
 		</dict>
 	</array>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>4.1.0</string>
+	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

diff --git a/platform/iphone/rbuild/iphone.rake b/platform/iphone/rbuild/iphone.rake
@@ -71,7 +71,7 @@ def set_app_version(newversion)
     else
       buf << line
     end
-    nextline = true if line =~ /CFBundleVersion/
+    nextline = true if line =~ /CFBundleShortVersionString/
   end
   File.open(fname,"w") { |f| f.write(buf) }
   return ret_value