Remove web3j dependency (#17)

* Make code backwards compatible with previous Gradle versions

* Remove web3j dependency and update README

* Update Solidity plugin version

Author: xaviarias

README.md

@@ -1,7 +1,7 @@
 web3j Gradle Plugin
 ===================
 
-Gradle plugin that generates [web3j](https://web3j.io/) Java wrappers from Solidity smart contracts.
+Gradle plugin that generates [web3j][web3j] Java wrappers from Solidity smart contracts.
 It smoothly integrates with your project's build lifecycle by adding specific tasks that can be also
 run independently.
 
@@ -11,6 +11,8 @@ Before you start, you will need to install the
 [Solidity compiler](https://solidity.readthedocs.io/en/latest/installing-solidity.html)
 if is not already installed in your computer.
 
+In addition, the minimum Gradle version to run the plugin is `4.9` and the recommended `5.2.x`.
+
 ### Using the `buildscript` convention
 
 To install the web3j Plugin using the old Gradle `buildscript` convention, you should add 
@@ -23,7 +25,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.web3j:web3j-gradle-plugin:4.1.1'
+        classpath 'org.web3j:web3j-gradle-plugin:4.1.2'
     }
 }
 
@@ -37,7 +39,7 @@ build file:
 
 ```groovy
 plugins {
-    id 'org.web3j' version '4.1.1'
+    id 'org.web3j' version '4.1.2'
 }
 ```
 
@@ -51,6 +53,18 @@ After applying the plugin, the base directory for generated code (by default
 `$buildDir/generated/source/web3j`) will contain a directory for each source set 
 (by default `main` and `test`) containing the smart contract wrappers Java classes.
 
+### Project dependencies
+
+The plugin requires the core [web3j][web3j] dependency to be declared in your project.
+The minimum version is 4.0 but is recommended to use the 
+[latest available release](https://github.com/web3j/web3j/releases).
+
+```groovy
+dependencies {
+    implementation "org.web3j:core:$web3jVersion"
+}
+```
+
 ## Code generation
 
 The `web3j` DSL allows to configure the generated code, e.g.:
@@ -125,3 +139,5 @@ To obtain a list and description of all added tasks, run the command:
 ```
 ./gradlew tasks --all
 ```
+
+[web3j]: https://web3j.io/

build.gradle

@@ -28,8 +28,8 @@ jacocoTestReport {
 }
 
 ext {
-    web3jVersion = version
-    solidityPluginVersion = '0.1.3'
+    web3jVersion = '4.1.1'
+    solidityPluginVersion = '0.1.4'
     junitVersion = '4.12'
 
     ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : System.getenv('OSSRH_USERNAME')

gradle.properties

@@ -1,2 +1,2 @@
 group=org.web3j
-version=4.1.1
+version=4.1.2

src/main/java/org/web3j/gradle/plugin/Web3jPlugin.java

@@ -7,6 +7,9 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.api.internal.file.DefaultSourceDirectorySet;
+import org.gradle.api.internal.file.IdentityFileResolver;
+import org.gradle.api.internal.file.collections.DefaultDirectoryFileTreeFactory;
 import org.gradle.api.plugins.Convention;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
@@ -24,13 +27,12 @@
  */
 public class Web3jPlugin implements Plugin<Project> {
 
-    public static final String ID = "org.web3j";
+    static final String ID = "org.web3j";
 
     public void apply(final Project target) {
         target.getPluginManager().apply(JavaPlugin.class);
         target.getPluginManager().apply(SolidityPlugin.class);
         target.getExtensions().create(Web3jExtension.NAME, Web3jExtension.class, target);
-        target.getDependencies().add("implementation", "org.web3j:core:4.1.1");
 
         final SourceSetContainer sourceSets = target.getConvention()
                 .getPlugin(JavaPluginConvention.class).getSourceSets();
@@ -65,7 +67,7 @@ private void configure(final Project project, final SourceSet sourceSet) {
                 generateTaskName, GenerateContractWrappers.class);
 
         // Set the sources for the generation task
-        task.setSource(buildSourceDirectorySet(project, sourceSet));
+        task.setSource(buildSourceDirectorySet(sourceSet));
         task.setDescription("Generates web3j contract wrappers for "
                 + sourceSet.getName() + " source set.");
 
@@ -89,13 +91,14 @@ private void configure(final Project project, final SourceSet sourceSet) {
         compileJava.dependsOn(task);
     }
 
-    private SourceDirectorySet buildSourceDirectorySet(
-            final Project project, final SourceSet sourceSet) {
+    private SourceDirectorySet buildSourceDirectorySet(final SourceSet sourceSet) {
 
         final String displayName = capitalize((CharSequence) sourceSet.getName()) + " Solidity ABI";
 
-        final SourceDirectorySet directorySet = project.getObjects()
-                .sourceDirectorySet(sourceSet.getName(), displayName);
+        final SourceDirectorySet directorySet = new DefaultSourceDirectorySet(
+                sourceSet.getName(), displayName,
+                new IdentityFileResolver(),
+                new DefaultDirectoryFileTreeFactory());
 
         directorySet.srcDir(buildOutputDir(sourceSet));
         directorySet.include("**/*.abi");

src/test/java/org/web3j/gradle/plugin/Web3jPluginTest.java

@@ -14,10 +14,7 @@
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
 import static org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class Web3jPluginTest {
 
@@ -57,6 +54,9 @@ public void generateContractWrappers() throws IOException {
                 "}\n" +
                 "repositories {\n" +
                 "   mavenCentral()\n" +
+                "}\n" +
+                "dependencies {\n" +
+                "   implementation \"org.web3j:core:4.1.1\"\n" +
                 "}\n";
 
         Files.write(buildFile.toPath(), buildFileContent.getBytes());