Use mavenLocal() repository instead of a local file repo

README.md

@@ -86,24 +86,15 @@ systemProp.socksProxyPort=9150
 
 ## Client library
 
-### "Uploading" to a local file repository (to use a local build of the library in a project)
+### "Uploading" to the local Maven repository (to use a local build of the library in a project)
 
-1. Add the following line to your `~/.gradle/gradle.properties`:
+1. `gradle :client:installArchives`
 
-    ```
+2. Add the local Maven repository to your project. For Gradle projects, add the following above any existing repositories (so it is checked first):
-    localFileRepoDir=/path/to/local/file/repo
-    ```
-
-2. `gradle :client:uploadArchives`
-
-3. Add the resulting directory to your project as a repository. For Gradle projects, add the following above any existing repositories (so it is checked first):
 
     ```
     repositories {
-        flatDir {
+        mavenLocal()
-            name 'fileRepo'
-            dirs file('/path/to/local/file/repo')
-        }
     }
     ```
 

build.gradle

@@ -8,17 +8,6 @@ buildscript {
     }
 }
 
-if (hasProperty('localFileRepoDir')) {
-    allprojects {
-        repositories {
-            flatDir {
-                name "fileRepo"
-                dirs file(localFileRepoDir)
-            }
-        }
-    }
-}
-
 allprojects {
     version = VERSION_NAME
     group = GROUP

client/build.gradle

@@ -45,23 +45,15 @@ android.libraryVariants.all { variant ->
     copyClientLibsTask.mustRunAfter ':routerjars:buildClient'
 }
 
-if (hasProperty('localFileRepoDir')) {
+apply from: "${project.rootDir}/gradle/maven-push.gradle"
-    uploadArchives {
-        repositories {
-            add project.repositories.fileRepo
-        }
-    }
-} else {
-    apply from: "${project.rootDir}/gradle/maven-push.gradle"
 
-    // Remove routerjars from dependencies
+// Remove routerjars from dependencies
-    afterEvaluate { project ->
+afterEvaluate { project ->
-        def deployer = uploadArchives.repositories.mavenDeployer
+    def deployer = uploadArchives.repositories.mavenDeployer
-        deployer*.pom*.whenConfigured { pom ->
+    deployer*.pom*.whenConfigured { pom ->
-            pom.setDependencies(pom.dependencies.collect { dep ->
+        pom.setDependencies(pom.dependencies.collect { dep ->
-                if (dep.groupId != 'i2p.android.base' && dep.artifactId != 'routerjars')
+            if (dep.groupId != 'i2p.android.base' && dep.artifactId != 'routerjars')
-                    dep
+                dep
-            })
+        })
-        }
     }
-}
+}

gradle/maven-push.gradle

@@ -88,38 +88,42 @@ afterEvaluate { project ->
         }
     }
 
+    task installArchives(type: Upload) {
+        description "Installs the artifacts to the local Maven repository."
+        configuration = configurations['archives']
+        repositories {
+            mavenDeployer {
+                pom.groupId = GROUP
+                pom.artifactId = POM_ARTIFACT_ID
+                pom.version = VERSION_NAME
+
+                repository url: "file://${System.properties['user.home']}/.m2/repository"
+            }
+        }
+    }
+
     signing {
         required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
         sign configurations.archives
     }
 
-    android.libraryVariants.all { variant ->
+    task androidJavadocs(type: Javadoc) {
-        def androidJavadocs = task("android${variant.name.capitalize()}Javadocs", type: Javadoc) {
+        source = android.sourceSets.main.java.srcDirs
-            source = variant.javaCompile.source
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-            def androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-
-            classpath = files(variant.javaCompile.classpath.files, androidJar)
-            options {
-                links 'http://docs.oracle.com/javase/6/docs/api/'
-                linksOffline 'http://d.android.com/reference',"${android.sdkDirectory}/docs/reference"
-            }
-            exclude '**/BuildConfig.java'
-            exclude '**/R.java'
-        }
-
-        def androidJavadocsJar = task("android${variant.name.capitalize()}JavadocsJar", type: Jar, dependsOn: androidJavadocs) {
-            classifier = 'javadoc'
-            from androidJavadocs.destinationDir
-        }
-
-        def androidSourcesJar = task("android${variant.name.capitalize()}SourcesJar", type: Jar) {
-            classifier = 'sources'
-            from variant.javaCompile.source
-        }
-
-        artifacts {
-            archives androidSourcesJar
-            archives androidJavadocsJar
-        }
     }
-}
+
+    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+        classifier = 'javadoc'
+        from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.sourceFiles
+    }
+
+    artifacts {
+        archives androidSourcesJar
+        archives androidJavadocsJar
+    }
+}