Feature/android support

.gitignore

@@ -24,3 +24,4 @@ build
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+

.travis.yml

@@ -6,15 +6,21 @@ jdk:
   - openjdk8
 install: true
 
+env:
+  - ANDROID_HOME=$HOME/android-sdk
+
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $ANDROID_HOME
 
 script:
+  - ./prepareAndroidHome.sh
+  - ./gradlew -PnewVersion="$TRAVIS_TAG" --version
   - ./gradlew -PnewVersion="$TRAVIS_TAG" clean
   - ./gradlew -PnewVersion="$TRAVIS_TAG" build
   - ./gradlew -PnewVersion="$TRAVIS_TAG" check

build.gradle

@@ -18,9 +18,16 @@ if (project.hasProperty('newVersion')) {
     project.version = '1.0.33-SNAPSHOT'
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 repositories {
     mavenCentral()
     mavenLocal()
+    google()
+    jcenter()
 }
 
 dependencies {
@@ -36,6 +43,8 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
     testImplementation gradleTestKit()
     testImplementation 'org.assertj:assertj-core:3.15.0'
+    testRuntimeOnly("com.android.tools.build:gradle:4.0.1")
+    testRuntimeOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
 }
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Fri May 01 20:33:27 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

prepareAndroidHome.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ! -d $ANDROID_HOME ]; then
+  mkdir -p $ANDROID_HOME
+  echo "sdk.dir=$ANDROID_HOME" > local.properties
+
+  mkdir $ANDROID_HOME/licenses
+  echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_HOME/licenses/android-sdk-license
+fi

src/main/groovy/com/github/roroche/plantuml/android/AndroidProjectType.groovy

@@ -0,0 +1,24 @@
+package com.github.roroche.plantuml.android
+
+import org.gradle.api.Project
+
+/***
+ * Class to determine if a project has an Android plugin applied
+ */
+class AndroidProjectType {
+    private AndroidProjectType() {
+
+    }
+
+    static boolean isAndroidProject(Project project) {
+        return isAndroidApplication(project) || isAndroidLibrary(project)
+    }
+
+    static boolean isAndroidApplication(Project project) {
+        return project.pluginManager.hasPlugin("com.android.application")
+    }
+
+    static boolean isAndroidLibrary(Project project) {
+        return project.pluginManager.hasPlugin("com.android.library")
+    }
+}

src/main/groovy/com/github/roroche/plantuml/tasks/BuildClassDiagramTask.groovy

@@ -5,10 +5,14 @@ import com.github.roroche.plantuml.diagrams.ClassDiagram
 import com.github.roroche.plantuml.diagrams.Diagram
 import com.github.roroche.plantuml.diagrams.DiagramWithLog
 import com.github.roroche.plantuml.urls.CompileClasspathUrls
+import com.github.roroche.plantuml.urls.CompileClasspathUrlsFactory
+import com.github.roroche.plantuml.urls.FilesUrls
 import com.github.roroche.plantuml.urls.LoggableUrls
 import com.github.roroche.plantuml.urls.MainOutputUrls
+import com.github.roroche.plantuml.urls.MainOutputUrlsFactory
 import com.github.roroche.plantuml.urls.MergedUrls
 import org.gradle.api.DefaultTask
+import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
@@ -78,6 +82,12 @@ class BuildClassDiagramTask extends DefaultTask implements CustomTask {
                 new ClassDiagram(classes),
                 logger
         )
+
+        def outputFileParent = extension.outputFile.parentFile
+        if (!outputFileParent.exists()) {
+            outputFileParent.mkdirs()
+        }
+
         diagram.print(extension.outputFile)
     }
 
@@ -86,13 +96,13 @@ class BuildClassDiagramTask extends DefaultTask implements CustomTask {
         return new URLClassLoader(
                 new MergedUrls(
                         Arrays.asList(
-                                new LoggableUrls(
-                                        new CompileClasspathUrls(project),
+                               new LoggableUrls(
+                                        CompileClasspathUrlsFactory.createCompileClasspathUrls(project),
                                         "CompileClasspath",
                                         logger
                                 ),
                                 new LoggableUrls(
-                                        new MainOutputUrls(project),
+                                        MainOutputUrlsFactory.createMainOutputUrls(project),
                                         "MainOutput",
                                         logger
                                 )

src/main/groovy/com/github/roroche/plantuml/urls/CompileClasspathUrls.groovy

@@ -23,7 +23,7 @@ class CompileClasspathUrls extends Urls.Wrap {
     CompileClasspathUrls(final Project project) {
         this(
                 new FilesUrls(
-                        project.configurations["compileClasspath"].files
+                    project.configurations["compileClasspath"].files
                 )
         )
     }

src/main/groovy/com/github/roroche/plantuml/urls/CompileClasspathUrlsFactory.groovy

@@ -0,0 +1,38 @@
+package com.github.roroche.plantuml.urls
+
+import org.gradle.api.Project
+
+import static com.github.roroche.plantuml.android.AndroidProjectType.*
+
+/**
+ * Factory for creating the correct classpath based on the type of a project
+ */
+class CompileClasspathUrlsFactory {
+    static Urls.Wrap createCompileClasspathUrls(Project project) {
+        if (isAndroidProject(project)) {
+            def classpath = []
+
+            project.android.getBootClasspath().each {
+                classpath.add(it)
+            }
+
+            def debugVariant
+
+            if (isAndroidLibrary(project)) {
+                debugVariant = project.android.libraryVariants.find {
+                    it.name.contains("debug") || it.name.contains("Debug")
+                }
+            } else {
+                debugVariant = project.android.applicationVariants.find {
+                    it.name.contains("debug") || it.name.contains("Debug")
+                }
+            }
+
+            classpath.addAll(debugVariant.javaCompileProvider.get().classpath.files)
+
+            return new CompileClasspathUrls(new FilesUrls(classpath.toSet()))
+        } else {
+            return new CompileClasspathUrls(project)
+        }
+    }
+}

src/main/groovy/com/github/roroche/plantuml/urls/MainOutputUrlsFactory.groovy

@@ -0,0 +1,26 @@
+package com.github.roroche.plantuml.urls
+
+import org.gradle.api.Project
+
+import static com.github.roroche.plantuml.android.AndroidProjectType.*
+
+/***
+ * Factory for creating the correct output URLs based on the type of a project
+ */
+class MainOutputUrlsFactory {
+    static Urls.Wrap createMainOutputUrls(Project project) {
+        if (isAndroidProject(project)) {
+            def debugTask = project.tasks.find {
+                it.name.contains("compile") && it.name.contains("DebugKotlin")
+            }
+
+            return new MainOutputUrls(
+                new FilesUrls(
+                    [debugTask.destinationDir].toSet()
+                )
+            )
+        } else {
+            return new MainOutputUrls(project)
+        }
+    }
+}

src/test/groovy/com/github/roroche/plantuml/android/AndroidProjectTypeTest.groovy

@@ -0,0 +1,44 @@
+package com.github.roroche.plantuml.android
+
+import com.github.roroche.plantuml.urls.MainOutputUrlsFactory
+import com.github.roroche.plantuml.urls.Urls
+import org.gradle.api.Project
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.jupiter.api.Test
+
+class AndroidProjectTypeTest {
+    private final Project project = ProjectBuilder.builder().build()
+
+    @Test
+    void testProjectIsAndroidApplication() {
+        project.apply plugin: "com.android.application"
+        project.android {
+            compileSdkVersion 21
+        }
+        project.evaluate()
+
+        assert AndroidProjectType.isAndroidProject(project)
+        assert AndroidProjectType.isAndroidApplication(project)
+        assert !AndroidProjectType.isAndroidLibrary(project)
+    }
+
+    @Test
+    void testProjectIsAndroidLibrary() {
+        project.apply plugin: "com.android.library"
+        project.android {
+            compileSdkVersion 21
+        }
+        project.evaluate()
+
+        assert AndroidProjectType.isAndroidProject(project)
+        assert !AndroidProjectType.isAndroidApplication(project)
+        assert AndroidProjectType.isAndroidLibrary(project)
+    }
+
+    @Test
+    void testProjectIsNotAndroid() {
+        assert !AndroidProjectType.isAndroidProject(project)
+        assert !AndroidProjectType.isAndroidApplication(project)
+        assert !AndroidProjectType.isAndroidLibrary(project)
+    }
+}

src/test/groovy/com/github/roroche/plantuml/urls/CompileClasspathUrlsFactoryTest.groovy

@@ -0,0 +1,54 @@
+package com.github.roroche.plantuml.urls
+
+import org.gradle.api.Project
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.jupiter.api.Test
+
+class CompileClasspathUrlsFactoryTest {
+
+    Project project
+
+    CompileClasspathUrlsFactoryTest() {
+        project = ProjectBuilder.builder().build()
+    }
+
+    @Test
+    void testJavaProjectShouldReturnCorrectClassPathForAndroidAppProject() {
+        project.apply plugin: "com.android.application"
+        project.android {
+            compileSdkVersion 21
+        }
+        project.evaluate()
+
+        Urls.Wrap urls = CompileClasspathUrlsFactory.createCompileClasspathUrls(project)
+
+        def files = []
+
+        urls.toList().each { url ->
+            files.add(new File(url.toURI()).getName())
+        }
+
+        assert files.contains("android.jar")
+        assert files.contains("R.jar")
+    }
+
+    @Test
+    void testJavaProjectShouldReturnCorrectClassPathForAndroidLibraryProject() {
+        project.apply plugin: "com.android.library"
+        project.android {
+            compileSdkVersion 21
+        }
+        project.evaluate()
+
+        Urls.Wrap urls = CompileClasspathUrlsFactory.createCompileClasspathUrls(project)
+
+        def files = []
+
+        urls.toList().each { url ->
+            files.add(new File(url.toURI()).getName())
+        }
+
+        assert files.contains("android.jar")
+        assert files.contains("R.jar")
+    }
+}