motion-gradle 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7d1e21e00dcb477190eb7a6e0de2f36ee3b4e8
-  data.tar.gz: b4e3be98c7c4387a6881efd07cc9c4a8274ec83e
+  metadata.gz: ab7bf0fb48a2a11c7185f459e73eb4c29a8cd5ed
+  data.tar.gz: ec1558bda34ca51e8685eff54ff71162b26c2975
 SHA512:
-  metadata.gz: 77aff100b7a615b29353630e7a7581760ea669375ea3d5b7baed6a0c0d77af6f251846c424c591fd07475222a14afd8cc728fffc1e4e2ff13026abb460f6078e
-  data.tar.gz: fac3b97a797b514fa2d5660dec7023a22fb5cbff17aa1912a67142c5180d74c873684cdffeaf4f8e36afd3e3f145e6b0bcbed1d24ecb21ea171750d695a07516
+  metadata.gz: 86af7c01d52090e405c6a59b6e1ce264f9900981c6eb3407c22d39bacf7826b7d15fa0bfa653ec729f5bd83288140e7faa069507ecdfb493fa89821b769b33cc
+  data.tar.gz: 31a5aefb68bfd69046c44daeae47fda97a780d857bdd03ded26f63436f531a948783360681a2d346299d57558ec73aad76894be1a50150eb52deeb3d6553c115

data/README.md

@@ -41,22 +41,18 @@ You also need to install `Extras/Android Support Repository` with the Android SD
 
 2. Still in the `Rakefile`, set your dependencies
 
+From version 1.1.0 you can use the same gradle dependency string that Java users use.
+
   ```ruby
   Motion::Project::App.setup do |app|
     # ...
     app.gradle do
-      dependency 'com.mcxiaoke.volley', :artifact => 'library', :version => '1.0.10'
-      dependency 'commons-cli'
-      dependency 'ehcache', :version => '1.2.3'
+      dependency 'net.sf.ehcache:ehcache:2.9.0'
+      dependency 'com.joanzapata.pdfview:android-pdfview:1.0.+@aar'
     end
   end
   ```
 
-  * :version will default to latest: +
-
-  * :artifact will default to dependency name
-
-
 ## Configuration
 
 If the `gradle` command is not found in your PATH, you can configure it:

data/lib/motion/project/gradle.erb

@@ -1,22 +1,22 @@
 apply plugin: 'java'
 apply plugin: 'eclipse'
 
-task generateDependencies(type: Jar) {
-  exclude 'META-INF/LICENSE'
-  exclude 'META-INF/LICENSE.txt'
-  exclude 'META-INF/NOTICE'
-  exclude 'META-INF/NOTICE.txt'
-
-  baseName = 'dependencies'
-  from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-  with jar
+task generateDependencies(type: Copy) {
+  from sourceSets.main.runtimeClasspath
+  into 'dependencies/'
 }
 
 repositories {
-  def androidHome = System.getenv("RUBYMOTION_ANDROID_SDK")
-  maven {
-    url "$androidHome/extras/android/m2repository/"
-  }
+  <% if android_repository %>
+    maven {
+      url "<%= ENV['RUBYMOTION_ANDROID_SDK'] %>/extras/android/m2repository/"
+    }
+  <% end %>
+  <% if google_repository %>
+    maven {
+      url "<%= ENV['RUBYMOTION_ANDROID_SDK'] %>/extras/google/m2repository/"
+    }
+  <% end %>
   <% @repositories.each do |url| %>
     maven {
       url "<%= url %>"
@@ -27,6 +27,14 @@ repositories {
  
 dependencies {
   <% @dependencies.each do |dependency| %>
-    compile '<%= dependency[:name] %>:<%= dependency[:artifact] %>:<%= dependency[:version] %>'
+    <% if dependency.is_a?(String) %>
+      compile '<%= dependency %>'
+    <% 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 %>
+    <% end %>
   <% end %>
 }

data/lib/motion/project/gradle.rb

@@ -21,6 +21,7 @@ module Motion::Project
 
   class Gradle
     GRADLE_ROOT = 'vendor/Gradle'
+    attr_reader :dependencies
 
     def initialize(config)
       @gradle_path = '/usr/bin/env gradle'
@@ -31,7 +32,8 @@ module Motion::Project
     end
 
     def configure_project
-      @config.vendor_project(:jar => "#{GRADLE_ROOT}/build/libs/dependencies.jar")
+      vendor_aars
+      vendor_jars
     end
 
     def path=(path)
@@ -39,27 +41,93 @@ module Motion::Project
     end
 
     def dependency(name, options = {})
-      @dependencies << normalized_dependency(name, options)
+      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)
+      end
     end
 
-    def repository(url, options = {})
+    def repository(url)
       @repositories << url
     end
 
     def install!(update)
       generate_gradle_build_file
-      support_repository = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'extras', 'android', 'm2repository')
+      system("#{gradle_command} --build-file #{gradle_build_file} generateDependencies")
 
-      unless File.exist?(support_repository)
-        gui_path = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'tools', 'android')
-        $stderr.puts("[!] To use motion-gradle you need to install `Extras/Android Support Repository`. Open the gui to install it : #{gui_path}")
-        exit(1)
+      # this might be uneeded in the future
+      # if RM does support .aar out of the box
+      extract_aars
+    end
+
+    def android_repository
+      android_repository = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'extras', 'android', 'm2repository')
+      unless exist = File.exist?(android_repository)
+        App.info('[warning]', "To avoid issues you should install `Extras/Android Support Repository`. Open the gui to install it : #{android_gui_path}")
       end
+      exist
+    end
 
-      system("#{gradle_command} --build-file #{gradle_build_file} generateDependencies")
+    def google_repository
+      google_repository = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'extras', 'google', 'm2repository')
+      unless exist = File.exist?(google_repository)
+        App.info('[warning]', "To avoid issues you should install `Extras/Google Repository`. Open the gui to install it : #{android_gui_path}")
+      end
+      exist
     end
 
     # Helpers
+    def vendor_aars
+      aars_dependendies = Dir[File.join(GRADLE_ROOT, 'aar/*')]
+      aars_dependendies.each do |dependency|
+        vendor_options = {:jar => File.join(dependency, 'classes.jar')}
+
+        res = File.join(dependency, 'res')
+        if File.exist?(res)
+          vendor_options[:resources] = res
+          vendor_options[:manifest] = File.join(dependency, 'AndroidManifest.xml')
+        end
+
+        native = File.join(dependency, 'jni')
+        if File.exist?(native)
+          archs = @config.archs.uniq.map do |arch|
+            @config.armeabi_directory_name(arch)
+          end
+
+          libs = Dir[File.join(native, "{#{archs.join(',')}}", "*.so")]
+          if libs.count != archs.count
+            App.info('[warning]', "Found only #{libs.count} lib(s) -> #{libs.join(',')} for #{archs.count} arch(s) : #{archs.join(',')}")
+          end
+          vendor_options[:native] = libs
+        end
+
+        @config.vendor_project(vendor_options)
+      end
+    end
+
+    def vendor_jars
+      jars = Dir[File.join(GRADLE_ROOT, 'dependencies/*.jar')]
+      jars.each do |jar|
+        @config.vendor_project(:jar => jar)
+      end
+    end
+
+    def android_gui_path
+      @android_gui_path ||= File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'tools', 'android')
+    end
+
+    def extract_aars
+      aars = Dir[File.join(GRADLE_ROOT, "dependencies/**/*.aar")]
+      aar_dir = File.join(GRADLE_ROOT, 'aar')
+      FileUtils.mkdir_p(aar_dir)
+      aars.each do |aar|
+        filename = File.basename(aar, '.aar')
+        system("unzip -o -qq #{aar} -d #{aar_dir}/#{filename}")
+      end 
+    end
+
     def generate_gradle_build_file
       template_path = File.expand_path("../gradle.erb", __FILE__)
       template = ERB.new(File.new(template_path).read, nil, "%")
@@ -89,22 +157,20 @@ module Motion::Project
       {
         name: name,
         version: options.fetch(:version, '+'),
-        artifact: options.fetch(:artifact, name)
+        artifact: options.fetch(:artifact, name),
+        extension: options.fetch(:extension, false),
       }
     end
-
-    def inspect
-      @dependencies.map do |dependency|
-        "#{dependency[:name]} - #{dependency[:artifact]} (#{dependency[:version]})"
-      end.inspect
-    end
   end
 end
 
 namespace :gradle do
   desc "Download and build dependencies"
   task :install do
-    FileUtils.mkdir_p(Motion::Project::Gradle::GRADLE_ROOT)
+    root = Motion::Project::Gradle::GRADLE_ROOT
+    FileUtils.mkdir_p(root)
+    rm_rf(File.join(root, 'dependencies'))
+    rm_rf(File.join(root, 'aar'))
     dependencies = App.config.gradle
     dependencies.install!(true)
   end
@@ -112,10 +178,10 @@ end
 
 namespace :clean do
   task :all do
-    dir = Motion::Project::Gradle::GRADLE_ROOT
-    if File.exist?(dir)
-      App.info('Delete', dir)
-      rm_rf(dir)
+    root = Motion::Project::Gradle::GRADLE_ROOT
+    if File.exist?(root)
+      App.info('Delete', root)
+      rm_rf(root)
     end
   end
 end

data/lib/motion/project/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-gradle
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies: []
 description: motion-gradle allows RubyMotion Android projects to have access to the
   Gradle dependency manager.