motion-gradle 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16f9c7f8925294bb5446a31de105082f9d799808
-  data.tar.gz: cc88f7303a763464318e9be93755a5152de2051f
+  metadata.gz: 2bfa047d9cd237d1a2b521e4b87ecedaf35641b3
+  data.tar.gz: 17377bd105d6a6866313db0586e85d73648dc15d
 SHA512:
-  metadata.gz: 145450ef3276d010b5d79ced75ae2cea1e08dc038a9d0699014f56c1d365f02eb394d4f3a94a9c7264e9a9aada1c64a4c1d37161b0c05d836f36fe383b95f949
-  data.tar.gz: 491bdec52b3ee2b5fa8ebb291caa2a399781dd45f39dc01957db1ec6ac072117d5d56d9bf68d6fa7d0f3e845cc79c5527bb13217416805978adc18e51324c051
+  metadata.gz: 323045101d3e05a096e71ff0d6f5fbcccc4ae70ee42a54e496de34c14ff15a12faea2722300312efbd3c08888e5404e7b223c23e3c9abf4a0af792c0da0d80b6
+  data.tar.gz: 08a1e6033cff5945ac5b3cad685b898fbbba1398e5513b59576a96a64b30df3452125613e3a2dc7cc9ce5d22879b4cbb4fa15500b67a4e5867b54ea8404a5904

data/README.md

@@ -1,18 +1,18 @@
 # motion-gradle
 
-motion-gradle allows RubyMotion projects to integrate with 
+motion-gradle allows RubyMotion projects to integrate with
 [Gradle](https://gradle.org/) to manage your dependencies.
 
 
 ## Installation
 
-You need to have gradle installed: 
+You need to have gradle installed:
 
 ```
 $ brew install gradle
 ```
 
-And the gem installed: 
+And the gem installed:
 
 ```
 $ [sudo] gem install motion-gradle
@@ -24,7 +24,7 @@ Or if you use Bundler:
 gem 'motion-gradle'
 ```
 
-You also need to install `Extras/Android Support Repository` with the Android SDK Manager gui.
+You also need to install `Extras/Android Support Repository` and `Extras/Google Repository` with the Android SDK Manager gui.
 
 ![android-sdk-manager](https://raw.githubusercontent.com/jjaffeux/motion-gradle/master/images/android-sdk-manager.png)
 
@@ -99,6 +99,12 @@ task:
 $ [bundle exec] rake gradle:install
 ```
 
-After a `rake:clean:all` you will need to run the install task agin.
+After a `rake clean:all` you will need to run the install task agin.
 
 That’s all.
+
+
+## Known issues
+
+* Clunky .aar support, if you can provide failing cases of libs using .aar it would be great
+* Issue with iconify : http://hipbyte.myjetbrains.com/youtrack/issue/RM-867

data/lib/motion-gradle.rb

@@ -1,4 +1,5 @@
 require 'pathname'
 require 'shellwords'
+require 'motion/project/legacy_dependency'
 require 'motion/project/gradle'
 require 'motion/project/version'

data/lib/motion/project/gradle.erb

@@ -30,14 +30,10 @@ dependencies {
     compile project(':<%= library[:name] %>')
   <% end %>
   <% @dependencies.each do |dependency| %>
-    <% if dependency.is_a?(String) %>
-      compile '<%= dependency %>'
+    <% if dependency.is_a?(LegacyDependency) %>
+      <%= dependency.parse %>
     <% else %>
-      <% if dependency[:extension] %> 
-        compile group: '<%= dependency[:name] %>', name: '<%= dependency[:artifact] %>', version: '<%= dependency[:version] %>', ext: '<%= dependency[:extension]%>'
-      <% else %>
-        compile group: '<%= dependency[:name] %>', name: '<%= dependency[:artifact] %>', version: '<%= dependency[:version] %>'
-      <% end %>
+      compile '<%= dependency %>'
     <% end %>
   <% end %>
 }

data/lib/motion/project/gradle.rb

@@ -46,8 +46,7 @@ module Motion::Project
       if name.include?(':')
         @dependencies << name
       else
-        App.info('[deprecated]', "dependency('name', options) syntax is deprecated please use a gradle config string, eg: dependency('com.joanzapata.pdfview:android-pdfview:1.0.+@aar') ")
-        @dependencies << normalized_dependency(name, options)
+        @dependencies << LegacyDependency.new(name, options)
       end
     end
 
@@ -97,7 +96,17 @@ module Motion::Project
     def vendor_aars
       aars_dependendies = Dir[File.join(GRADLE_ROOT, 'aar/*')]
       aars_dependendies.each do |dependency|
-        vendor_options = {:jar => File.join(dependency, 'classes.jar')}
+        main_jar = File.join(dependency, 'classes.jar')
+        if File.exist?(main_jar)
+          vendor_options = {:jar => main_jar}
+        else
+          next
+        end
+
+        # libs/*.jar may contain dependencies, let's vendor them
+        Dir[File.join(dependency, 'libs/*.jar')].each do |internal_dependancy|
+          @config.vendor_project({:jar => internal_dependancy})
+        end
 
         res = File.join(dependency, 'res')
         if File.exist?(res)
@@ -140,7 +149,7 @@ module Motion::Project
       aars.each do |aar|
         filename = File.basename(aar, '.aar')
         system("unzip -o -qq #{aar} -d #{aar_dir}/#{filename}")
-      end 
+      end
     end
 
     def generate_gradle_settings_file
@@ -179,15 +188,6 @@ module Motion::Project
         "#{@gradle_path}"
       end
     end
-
-    def normalized_dependency(name, options)
-      {
-        name: name,
-        version: options.fetch(:version, '+'),
-        artifact: options.fetch(:artifact, name),
-        extension: options.fetch(:extension, false),
-      }
-    end
   end
 end
 

data/lib/motion/project/legacy_dependency.rb

@@ -0,0 +1,21 @@
+class LegacyDependency
+  def initialize(name, params)
+    @options = normalized_dependency(name, params)
+  end
+
+  def parse
+    options = @options.delete_if { |_, v| v.nil? }.map {|k, v| "#{k}: '#{v}'"}
+    "compile #{options.join(', ')}"
+  end
+
+  protected
+
+  def normalized_dependency(name, params)
+    {
+      group: name,
+      version: params.fetch(:version, '+'),
+      name: params.fetch(:artifact, name),
+      ext: params.fetch(:extension, nil),
+    }
+  end
+end

data/lib/motion/project/version.rb

@@ -1,5 +1,5 @@
 module Motion::Project
   class Gradle
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-gradle
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies: []
 description: motion-gradle allows RubyMotion Android projects to have access to the
   Gradle dependency manager.
@@ -22,6 +22,7 @@ files:
 - lib/motion-gradle.rb
 - lib/motion/project/gradle.erb
 - lib/motion/project/gradle.rb
+- lib/motion/project/legacy_dependency.rb
 - lib/motion/project/settings.erb
 - lib/motion/project/version.rb
 homepage: http://www.rubymotion.com
@@ -49,3 +50,4 @@ signing_key:
 specification_version: 4
 summary: Gradle integration for RubyMotion Android projects
 test_files: []
+has_rdoc: