Kim pull request

.buckjavaargs

@@ -1 +1 @@
--Xmx4g
+-Xmx8g

.gitignore

@@ -14,3 +14,4 @@ gradle-user-home
 **/src/
 !**/src/*/AndroidManifest.xml
 !gradle/SourceTemplate/app/src
+!gradle/SourceTemplate/java-lib/src

README.md

@@ -5,6 +5,10 @@ Also provides an alternative build path using [Buck](https://buckbuild.com/) to
 
 [![Master branch build status](https://travis-ci.org/kageiit/android-studio-gradle-test.svg?branch=master)](https://travis-ci.org/kageiit/android-studio-gradle-test)
 
+## Setup
+
+Run `./gradlew addSources` to generate source code for all subprojects.
+
 ## To build all apps with gradle:
 ```bash
 ./buildWithGradle

build.gradle

@@ -1,11 +1,19 @@
 buildscript {
     repositories {
+        maven {
+            url "https://repo.gradle.org/gradle/libs/"
+            content {
+                includeModule "com.uber", "okbuck"
+                includeModule "com.google.android.exoplayer", "exoplayer"
+                includeModule "com.lovedise", "permissiongen"
+            }
+        }
         mavenLocal()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath ('com.uber:okbuck:0.16.3') {
           exclude module: 'gradle'
         }
@@ -15,10 +23,23 @@ buildscript {
 allprojects {
     project -> project.apply from: rootProject.file('dependencies.gradle')
     repositories {
-        jcenter()
+        maven {
+            url "https://repo.gradle.org/gradle/libs/"
+            content {
+                includeModule "com.google.android.exoplayer", "exoplayer"
+                includeModule "com.meetic.shuffle", "shuffle"
+                includeModule "com.meetic.dragueur", "dragueur"
+                includeModule "com.futuremind.recyclerfastscroll", "fastscroll"
+                includeModule "com.lovedise", "permissiongen"
+            }
+        }
+        mavenCentral()
     }
 
     def androidHome = System.getenv("ANDROID_HOME")
+    if (!androidHome) {
+        throw new IllegalArgumentException("ANDROID_HOME environment variable is not set.")
+    }
     repositories {
         maven {
             url "$androidHome/extras/android/m2repository/"
@@ -47,14 +68,18 @@ subprojects { project ->
             if (it.name.contains("Test")) {
                 resolutionStrategy {
                     force 'io.reactivex:rxandroid:1.2.1'
-                    force 'com.android.support:appcompat-v7:24.2.1'
-                    force 'com.android.support:recyclerview-v7:24.2.1'
-                    force 'com.android.support:animated-vector-drawable:24.2.1'
-                    force 'com.android.support:support-v4:24.2.1'
+                    force 'com.squareup.okio:okio:1.8.0'
+                    force 'io.reactivex:rxjava:1.1.8'
+                    force 'com.google.auto:auto-common:0.6'
+                    force 'com.android.support:appcompat-v7:25.1.0'
+                    force 'com.android.support:recyclerview-v7:25.1.0'
+                    force 'com.android.support:animated-vector-drawable:25.1.0'
+                    force 'com.android.support:support-v4:25.1.0'
                 }
             }
             resolutionStrategy {
                 force 'com.google.guava:guava:19.0'
+                force 'com.google.auto:auto-common:0.6'
             }
         }
 
@@ -165,6 +190,7 @@ task addSources {
                 println "Adding sources to: " + sourceFolder
                 copy {
                     from fileTree(new File(project.rootDir, "gradle/SourceTemplate/app/src/")).exclude("main/AndroidManifest.xml")
+                    from fileTree(new File(project.rootDir, "gradle/SourceTemplate/java-lib/src/"))
                     into sourceFolder
                 }
 
@@ -176,10 +202,21 @@ task addSources {
                 }
 
                 adjustPackage(it, "LoginActivity")
+                addReferencesToOtherClasses(it, "LoginActivity")
+                adjustPackage(it, "Thing")
                 if (hasAutoService) {
                     adjustPackage(it, "Service")
                 }
             }
+            if (it.plugins.hasPlugin('java')) {
+                def sourceFolder = new File(it.projectDir, 'src')
+                println "Adding sources to: " + sourceFolder
+                copy {
+                    from fileTree(new File(project.rootDir, "gradle/SourceTemplate/java-lib/src/"))
+                    into sourceFolder
+                }
+                adjustPackage(it, "Thing", "gradle.example.${it.name}")
+            }
         }
     }
 }
@@ -189,46 +226,38 @@ boolean hasDependency(Project project, String name) {
 }
 
 def adjustPackage(Project project, String className) {
-    def sourceFolder = new File(project.projectDir, 'src')
-    def sourceFile = new File(sourceFolder, "main/java/gradle/example/${className}.java")
-    def manifest = new File(sourceFolder, "main/AndroidManifest.xml").text
-    def projectPackage = manifest.substring(manifest.indexOf('package="') + 9, manifest.indexOf('" xmlns:android'))
+    def projectPackage = getProjectPackage(project)
+    adjustPackage(project, className, projectPackage)
+}
+
+def getProjectPackage(Project project) {
+  if (project.plugins.hasPlugin('com.android.application') || project.plugins.hasPlugin('com.android.library')) {
+    "com.studio.${project.name}"
+  } else {
+    "gradle.example.${project.name}"
+  }
+}
 
-    def exampleClassFolder = new File(sourceFolder, "main/java/${projectPackage.replace('.', '/')}")
+def adjustPackage(Project project, String className, String projectPackage) {
+    def sourceFolder = new File(project.projectDir, 'src/main/java')
+    def sourceFile = new File(sourceFolder, "gradle/example/${className}.java")
+
+    def exampleClassFolder = new File(sourceFolder, "${projectPackage.replace('.', '/')}")
     exampleClassFolder.mkdirs()
 
     sourceFile.text = sourceFile.text.replaceAll("package gradle.example;", "package ${projectPackage};")
     sourceFile.renameTo(new File(exampleClassFolder, "${className}.java"))
 }
 
-// Prevents resolving any configurations during evaluation
-class ConfigurationNullifierListener implements DependencyResolutionListener {
-
-    private final Project root
+def addReferencesToOtherClasses(Project project, String className) {
+    def sourceFolder = new File(project.projectDir, 'src/main/java')
+    def projectPackage = getProjectPackage(project)
+    def sourceFile = new File(sourceFolder, "${projectPackage.replace('.', '/')}/${className}.java")
+    def dependencyProjects = project.configurations.compile.allDependencies.withType(ProjectDependency).collect { it.dependencyProject}.toSet()
+    def fieldDeclarations = dependencyProjects.collect { "private ${getProjectPackage(it)}.Thing ${it.name}Thing;"}
 
-    ConfigurationNullifierListener(Project root) {
-        this.root = root
-    }
-
-    void beforeResolve(ResolvableDependencies dependencies) {
-        String name = dependencies.name
-        String path = dependencies.path
-        String projectPath = path.substring(0, path.lastIndexOf(":"))
-        Project p = root.project(projectPath)
-        try {
-            Configuration config = p.configurations.getByName(name)
-            config.dependencies.clear()
-            config.extendsFrom = []
-        } catch(Exception ignored) { }
-    }
-
-    void afterResolve(ResolvableDependencies dependencies) { }
-}
-
-if (System.getProperty("okbuck.wrapper", "false") == "true") {
-    final ConfigurationNullifierListener configurationNullifierListener = new ConfigurationNullifierListener(project)
-    gradle.addListener(configurationNullifierListener)
-    gradle.projectsEvaluated {
-        gradle.removeListener(configurationNullifierListener)
-    }
+    sourceFile.text = sourceFile.text.replace("private View mLoginFormView;", """
+      private View mLoginFormView;
+      ${fieldDeclarations.join('\n')}
+    """)
 }

dependencies.gradle

@@ -25,7 +25,7 @@ def android = [
 
 def annotationProcessor = [
         androidApi          : 'com.google.android:android:4.1.1.4',
-        autoCommon          : 'com.google.auto:auto-common:0.4',
+        autoCommon          : 'com.google.auto:auto-common:0.6',
         autoService         : 'com.google.auto.service:auto-service:1.0-rc2',
         autoValue           : 'com.google.auto.value:auto-value:1.4-rc1',
         autoValueAnnotations: 'com.jakewharton.auto.value:auto-value-annotations:1.2-update1',
@@ -162,7 +162,7 @@ def other = [
         rxrelay              : 'com.jakewharton.rxrelay:rxrelay:1.1.0',
         shuffle              : 'com.meetic.shuffle:shuffle:1.0.8',
         androidApi           : 'com.google.android:android:4.1.1.4',
-        autoCommon           : 'com.google.auto:auto-common:0.4',
+        autoCommon           : 'com.google.auto:auto-common:0.6',
         autoService          : 'com.google.auto.service:auto-service:1.0-rc2',
         autoValueGson        : 'com.ryanharter.auto.value:auto-value-gson:0.3.2-rc1',
         autoValueParcel      : 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.3-rc2',

gradle.properties

@@ -4,5 +4,7 @@ versionPatch=0
 
 org.gradle.daemon=true
 org.gradle.parallel=true
+org.gradle.configureondemand=true
 org.gradle.workers.max=16
 org.gradle.jvmargs=-Xmx4G
+android.useDexArchive=true

gradle/SourceTemplate/build.gradle

@@ -0,0 +1,20 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.2'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

gradle/SourceTemplate/gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx1536m
+

gradle/SourceTemplate/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip