motion-gradle 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bfa047d9cd237d1a2b521e4b87ecedaf35641b3
-  data.tar.gz: 17377bd105d6a6866313db0586e85d73648dc15d
+  metadata.gz: 50c2e48c77d0f368ee44667ae5d574c85ceb2c25
+  data.tar.gz: 577d8d409dd2fd063f9ca2d1e224561353279bfd
 SHA512:
-  metadata.gz: 323045101d3e05a096e71ff0d6f5fbcccc4ae70ee42a54e496de34c14ff15a12faea2722300312efbd3c08888e5404e7b223c23e3c9abf4a0af792c0da0d80b6
-  data.tar.gz: 08a1e6033cff5945ac5b3cad685b898fbbba1398e5513b59576a96a64b30df3452125613e3a2dc7cc9ce5d22879b4cbb4fa15500b67a4e5867b54ea8404a5904
+  metadata.gz: 98c82bdc75995ee8bfbe97bf5dda498089bf64b25350751aed15768ba5f8cb94727c698d1861dd7291b212ff6c3c66a822902618b71b0fe76081aa2f0646d600
+  data.tar.gz: 1492d7d43990043f70e0613af41ee12218a4a4be77308672902ac8ee9683d3ed36f39f40ee57366daaf840e7428c35ad3ec1fa7e10bb663c7ccff0bf221b69cc

data/README.md

@@ -31,15 +31,14 @@ You also need to install `Extras/Android Support Repository` and `Extras/Google
 
 ## Setup
 
-1. Edit the `Rakefile` of your RubyMotion project and add the following require
-   lines:
+Edit the `Rakefile` of your RubyMotion project and add the following require lines:
 
-   ```ruby
-   require 'rubygems'
-   require 'motion-gradle'
-   ```
+ ```ruby
+ require 'rubygems'
+ require 'motion-gradle'
+ ```
 
-2. Still in the `Rakefile`, set your dependencies
+### Dependencies
 
 From version 1.1.0 you can use the same gradle dependency string that Java users use.
 
@@ -53,7 +52,7 @@ From version 1.1.0 you can use the same gradle dependency string that Java users
   end
   ```
 
-## Configuration
+### Configuration
 
 If the `gradle` command is not found in your PATH, you can configure it:
 
@@ -64,7 +63,7 @@ Motion::Project::App.setup do |app|
 end
 ```
 
-You can also add other repositories :
+### Repositories :
 
 ```ruby
 Motion::Project::App.setup do |app|
@@ -76,7 +75,7 @@ Motion::Project::App.setup do |app|
 end
 ```
 
-## Support for local libraries
+### Java libraries
 
 ```ruby
 Motion::Project::App.setup do |app|
@@ -89,6 +88,39 @@ end
 
 If relative path is used it's relative to your Rakefile, if you don't specify a path it will search in your_app/my_lib.
 
+### Plugins
+
+```ruby
+Motion::Project::App.setup do |app|
+  # ...
+  app.gradle do
+    plugin 'com.google.gms.google-services'
+   end
+end
+```
+
+### Classpaths
+
+```ruby
+Motion::Project::App.setup do |app|
+  # ...
+  app.gradle do
+    classpath 'com.google.gms:google-services:1.3.0-beta1'
+  end
+end
+```
+
+### Aidl
+
+```ruby
+Motion::Project::App.setup do |app|
+  # ...
+  app.gradle do
+    aidl 'com.android.vending.billing', './vendor/IInAppBillingService.aidl'
+  end
+end
+```
+
 
 ## Tasks
 

data/lib/motion-gradle.rb

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

data/lib/motion/project/aidl.rb

@@ -0,0 +1,54 @@
+class Aidl
+  def initialize(package, aidl_file_path)
+    @package = package
+    @aidl_file_path = File.expand_path(aidl_file_path)
+  end
+
+  def create_lib
+    create_lib_structure
+    create_gradle_build_file
+    create_manifest
+  end
+
+  def name
+    @name ||= File.basename(@aidl_file_path, '.aidl').downcase
+  end
+
+  def path
+    @path ||= File.join(Motion::Project::Gradle::GRADLE_ROOT, name)
+  end
+
+  protected
+
+  def create_manifest
+    io = File.new(File.join(path, 'src', 'main', 'AndroidManifest.xml'), "w")
+    io.puts("<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"#{@package}\"></manifest>")
+    io.close
+  end
+
+  def create_gradle_build_file
+    locals = {last_build_tools_version: last_build_tools_version}
+    erb_template = generate_erb_template(File.expand_path("../aidl_build_gradle.erb", __FILE__), locals)
+    io = File.new(File.join(path, 'build.gradle',), "w")
+    io.puts(erb_template)
+    io.close
+  end
+
+  def create_lib_structure
+    aidl_file_dir = File.join(path, 'src', 'main', 'aidl', *@package.split('.'))
+    FileUtils.mkdir_p(aidl_file_dir)
+    FileUtils.cp(@aidl_file_path, aidl_file_dir)
+  end
+
+  def generate_erb_template(path, locals)
+    template_path = File.expand_path(path, __FILE__)
+    template = File.new(template_path).read
+    ERB.new(template).result(OpenStruct.new(locals).instance_eval { binding })
+  end
+
+  def last_build_tools_version
+    build_tools = File.join(ENV['RUBYMOTION_ANDROID_SDK'], 'build-tools')
+    builds_tools_directories = Dir.glob(File.join(build_tools, '*')).select {|f| File.directory? f}
+    File.basename(builds_tools_directories.last)
+  end
+end

data/lib/motion/project/aidl_build_gradle.erb

@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:1.0.+'
+  }
+}
+
+android {
+  compileSdkVersion <%= App.config.api_version %>
+  buildToolsVersion "<%= last_build_tools_version %>"
+
+  defaultConfig {
+    minSdkVersion <%= App.config.api_version %>
+    targetSdkVersion <%= App.config.api_version %>
+    versionCode 1
+    versionName "1.0"
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+}

data/lib/motion/project/gradle.erb

@@ -1,5 +1,27 @@
+buildscript {
+  repositories {
+    jcenter()
+    mavenCentral()
+  }
+  dependencies {
+    <% @classpaths.each do |classpath| %>
+      classpath '<%= classpath %>'
+    <% end %>
+  }
+}
+
+allprojects {
+  repositories {
+    jcenter()
+    mavenCentral()
+  }
+}
+
 apply plugin: 'java'
 apply plugin: 'eclipse'
+<% @plugins.each do |plugin| %>
+  apply plugin: '<%= plugin %>'
+<% end %>
 
 task generateDependencies(type: Copy) {
   from sourceSets.main.runtimeClasspath
@@ -22,7 +44,6 @@ repositories {
       url "<%= url %>"
     }
   <% end %>
-  mavenCentral()
 }
 
 dependencies {

data/lib/motion/project/gradle.rb

@@ -23,12 +23,16 @@ module Motion::Project
     GRADLE_ROOT = 'vendor/Gradle'
     attr_reader :dependencies
     attr_reader :libraries
+    attr_reader :aidls
 
     def initialize(config)
       @gradle_path = '/usr/bin/env gradle'
       @config = config
+      @classpaths = []
+      @plugins = []
       @dependencies = []
       @repositories = []
+      @aidl_files = []
       @libraries = []
       configure_project
     end
@@ -62,11 +66,24 @@ module Motion::Project
       }
     end
 
+    def aidl(package, aidl_file_path)
+      @aidl_files << Aidl.new(package, aidl_file_path)
+    end
+
+    def classpath(classpath)
+      @classpaths << classpath
+    end
+
+    def plugin(plugin)
+      @plugins << plugin
+    end
+
     def repository(url)
       @repositories << url
     end
 
     def install!(update)
+      vendor_aidl_files
       generate_gradle_settings_file
       generate_gradle_build_file
       system("#{gradle_command} --build-file #{gradle_build_file} generateDependencies")
@@ -93,12 +110,21 @@ module Motion::Project
     end
 
     # Helpers
+    def vendor_aidl_files
+      @aidl_files.each do |aidl_file|
+        aidl_file.create_lib
+        library(aidl_file.name, path: aidl_file.path)
+      end
+    end
+
     def vendor_aars
       aars_dependendies = Dir[File.join(GRADLE_ROOT, 'aar/*')]
       aars_dependendies.each do |dependency|
         main_jar = File.join(dependency, 'classes.jar')
         if File.exist?(main_jar)
-          vendor_options = {:jar => main_jar}
+          jar_path = File.join(dependency, "#{File.basename(dependency)}.jar")
+          FileUtils.mv(main_jar, jar_path)
+          vendor_options = {:jar => jar_path}
         else
           next
         end
@@ -148,7 +174,7 @@ module Motion::Project
       FileUtils.mkdir_p(aar_dir)
       aars.each do |aar|
         filename = File.basename(aar, '.aar')
-        system("unzip -o -qq #{aar} -d #{aar_dir}/#{filename}")
+        system("/usr/bin/unzip -o -qq #{aar} -d #{ File.join(aar_dir, filename)}")
       end
     end
 

data/lib/motion/project/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-gradle
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Joffrey Jaffeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies: []
 description: motion-gradle allows RubyMotion Android projects to have access to the
   Gradle dependency manager.
@@ -20,6 +20,8 @@ files:
 - LICENSE
 - README.md
 - lib/motion-gradle.rb
+- lib/motion/project/aidl.rb
+- lib/motion/project/aidl_build_gradle.erb
 - lib/motion/project/gradle.erb
 - lib/motion/project/gradle.rb
 - lib/motion/project/legacy_dependency.rb
@@ -45,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Gradle integration for RubyMotion Android projects