naether 0.4.2-java → 0.4.3-java

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/naether.rb

@@ -86,7 +86,15 @@ class Naether
   end
   
   def add_pom_dependencies( pom_path, scopes=['compile'] )
-    @resolver.addDependencies( pom_path, scopes )
+    if Naether.platform == 'java'
+      @resolver.addDependencies( pom_path, scopes )
+    else
+      list = Rjb::import("java.util.ArrayList").new
+      scopes.each do |scope|
+        list.add( scope )
+      end
+      @resolver._invoke( 'addDependencies', 'Ljava.lang.String;Ljava.util.List;', pom_path, list )
+    end
   end
   
   # Add a dependency Java object
@@ -199,7 +207,17 @@ class Naether
       load_pom( file_path )
     end
 
-    deps = Naether::Java.maven_project_dependencies_notation( @project_instance, scopes )
+    if Naether.platform == 'java'
+      deps = @project_instance.getDependenciesNotation( scopes, true )
+    else
+      if scopes
+        list = Rjb::import("java.util.ArrayList").new
+        scopes.each do |scope|
+          list.add( scope )
+        end
+      end
+      deps = @project_instance._invoke('getDependenciesNotation', 'Ljava.util.List;Z', list, true)
+    end
     
     Naether::Java.convert_to_ruby_array( deps, true )
   end

data/lib/naether/java.rb

@@ -60,14 +60,6 @@ class Naether
       end
     end
     
-    def self.maven_project_dependencies_notation( instance, scopes = nil )
-      if Naether.platform == 'java'
-        instance.getDependenciesNotation(scopes, true)
-      else
-        instance._invoke('getDependenciesNotation', 'Ljava.util.List;boolean;', scopes, true)
-      end
-    end
-    
     def self.convert_to_ruby_array( java_array, to_string = false )
       if Naether.platform == 'java'
         return java_array.to_a

data/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.slackworks</groupId>
     <artifactId>naether</artifactId>
-    <version>0.4.2</version>
+    <version>0.4.3</version>
     <packaging>jar</packaging>
     <name>naether</name>
     <url>https://github.com/mguymon/naether</url>

metadata

@@ -2,7 +2,7 @@
 name: naether
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.3
 platform: java
 authors: 
   - Michael Guymon
@@ -74,6 +74,7 @@ files:
   - lib/naether.rb
   - lib/naether/bootstrap.rb
   - lib/naether/java.rb
+  - naether-0.4.3.jar
   - pom.xml
 has_rdoc: true
 homepage: http://github.com/mguymon/naether