Skip to content
This repository
Browse code

merging changes for 3.2.1 to master

  • Loading branch information...
commit 079c39be76595feb535d2e92c1699654c0724ef6 1 parent 9c8f9df
Albert R. Timashev timashev authored
4 CHANGELOG
... ... @@ -1,3 +1,7 @@
  1 +## 3.2.1
  2 +* Add migrate-rhodes-app command that updates build.yml to use latest Rhodes gem
  3 +* Change set-rhodes-sdk command to set sdk path at build.yml only
  4 +
1 5 ## 3.2
2 6 * Migrate to Ruby 1.9.2
3 7 * Support reset selected models
0  bin/migrate-rhodes-app 100644 → 100755
File mode changed
2  lib/framework/rhodes.rb
... ... @@ -1,6 +1,6 @@
1 1 module Rhodes
2 2 unless defined? Rhodes::VERSION
3   - VERSION = '3.2.0'
  3 + VERSION = '3.2.1'
4 4 end
5 5 unless defined? Rhodes::DBVERSION
6 6 DBVERSION = '2.2.0'
2  lib/framework/version.rb
... ... @@ -1,6 +1,6 @@
1 1 module RhodesFramework
2 2 unless defined? RhodesFramework::VERSION
3   - VERSION = '3.2.0'
  3 + VERSION = '3.2.1'
4 4 end
5 5 unless defined? RhodesFramework::DBVERSION
6 6 DBVERSION = '2.2.2'
2  lib/rhodes.rb
... ... @@ -1,6 +1,6 @@
1 1 module Rhodes
2 2 unless defined? Rhodes::VERSION
3   - VERSION = '3.2.0'
  3 + VERSION = '3.2.1'
4 4 end
5 5 unless defined? Rhodes::DBVERSION
6 6 DBVERSION = '2.2.0'
4 platform/android/Rhodes/AndroidManifest.xml
@@ -2,8 +2,8 @@
2 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 package="com.rhomobile.rhodes"
4 4 android:installLocation="auto"
5   - android:versionCode="35"
6   - android:versionName="3.2.0">
  5 + android:versionCode="36"
  6 + android:versionName="3.2.1">
7 7
8 8 <uses-sdk android:minSdkVersion="8" />
9 9
2  platform/iphone/Info.plist
@@ -38,7 +38,7 @@
38 38 <key>CFBundleSignature</key>
39 39 <string>????</string>
40 40 <key>CFBundleVersion</key>
41   - <string>3.2.0</string>
  41 + <string>3.2.1</string>
42 42 <key>LSRequiresIPhoneOS</key>
43 43 <true/>
44 44 <key>UILaunchImageFile</key>
2  version
... ... @@ -1 +1 @@
1   -3.2.0
  1 +3.2.1

0 comments on commit 079c39b

Please sign in to comment.
Something went wrong with that request. Please try again.