rhodes 2.3.1 → 2.3.2.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  module Rhodes
2
2
  unless defined? Rhodes::VERSION
3
- VERSION = '2.3.1'
3
+ VERSION = '2.3.2'
4
4
  end
5
5
  unless defined? Rhodes::DBVERSION
6
6
  DBVERSION = '2.2.0'
@@ -1,6 +1,6 @@
1
1
  module RhodesFramework
2
2
  unless defined? RhodesFramework::VERSION
3
- VERSION = '2.3.1'
3
+ VERSION = '2.3.2'
4
4
  end
5
5
  unless defined? RhodesFramework::DBVERSION
6
6
  DBVERSION = '2.2.2'
data/lib/rhodes.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Rhodes
2
2
  unless defined? Rhodes::VERSION
3
- VERSION = '2.3.1'
3
+ VERSION = '2.3.2'
4
4
  end
5
5
  unless defined? Rhodes::DBVERSION
6
6
  DBVERSION = '2.2.0'
@@ -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="29"
6
- android:versionName="2.3.1">
5
+ android:versionCode="30"
6
+ android:versionName="2.3.2">
7
7
 
8
8
  <uses-sdk android:minSdkVersion="4" />
9
9
 
@@ -368,7 +368,8 @@ namespace "config" do
368
368
  $adb = File.join( $androidsdkpath, "platform-tools", "adb" + $exe_ext ) unless File.exists? $adb
369
369
  $zipalign = File.join( $androidsdkpath, "tools", "zipalign" + $exe_ext )
370
370
  $androidjar = File.join($androidsdkpath, "platforms", $androidplatform, "android.jar")
371
- $dxjar = File.join( $androidsdkpath, "platform-tools", "lib", "dx.jar")
371
+ $dxjar = File.join( $androidsdkpath, "platforms", $androidplatform, "tools", "lib", "dx.jar")
372
+ $dxjar = File.join( $androidsdkpath, "platform-tools", "lib", "dx.jar") unless File.exists? $dxjar
372
373
 
373
374
  $keytool = File.join( $java, "keytool" + $exe_ext )
374
375
  $jarsigner = File.join( $java, "jarsigner" + $exe_ext )
@@ -38,7 +38,7 @@
38
38
  <key>CFBundleSignature</key>
39
39
  <string>????</string>
40
40
  <key>CFBundleVersion</key>
41
- <string>2.3.1</string>
41
+ <string>2.3.2</string>
42
42
  <key>LSRequiresIPhoneOS</key>
43
43
  <true/>
44
44
  <key>UILaunchImageFile</key>
@@ -5,10 +5,15 @@
5
5
  <head>
6
6
 
7
7
  <title><%= class_name %></title>
8
- <meta name="viewport" content="width=device-width; height=device-height; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
9
-
10
- <%% is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version') =~ /^6\.0/) %>
11
8
 
9
+ <%% is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version') =~ /^6\.0/) %>
10
+
11
+ <%% if is_bb6 %>
12
+ <meta name="viewport" content="width=device-width; height=device-height; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
13
+ <%% else %>
14
+ <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
15
+ <%% end %>
16
+
12
17
  <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 %>
13
18
  <script src="/public/jqtouch/jquery.1.3.2.min.js" type="text/javascript"></script>
14
19
  <script src="/public/jqtouch/jqtouch.js" type="text/javascript"></script>
data/rhodes.gemspec CHANGED
@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = %q{rhodes}
6
- s.version = Rhodes::VERSION
6
+ s.version = "2.3.2.beta.1"
7
7
 
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Rhomobile"]
metadata CHANGED
@@ -1,13 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhodes
3
3
  version: !ruby/object:Gem::Version
4
- hash: 1
5
- prerelease: false
4
+ hash: 62196417
5
+ prerelease: true
6
6
  segments:
7
7
  - 2
8
8
  - 3
9
+ - 2
10
+ - beta
9
11
  - 1
10
- version: 2.3.1
12
+ version: 2.3.2.beta.1
11
13
  platform: ruby
12
14
  authors:
13
15
  - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
15
17
  bindir: bin
16
18
  cert_chain: []
17
19
 
18
- date: 2011-03-02 00:00:00 -08:00
20
+ date: 2011-03-09 00:00:00 -08:00
19
21
  default_executable:
20
22
  dependencies:
21
23
  - !ruby/object:Gem::Dependency