Release/v1.0.17 (#157)

* prepare for next dev cycle * Feature/#103 (#111) * #103 adding analyzers for most reports in the form of errors and warnings * #108 fixed * Bug/#119 (#120) failed to compile due to hard coded configuration names #119 should resolve this * #119 potential fix * Feature/#116 site boostrap (#117) * #116 initial test * #116 site bootstrap * #114 done (#121) #90 done * #123 fix for site bootstrap bootstrapping all the time (#126) #124 gradle dependency report #125 site sample cleanup * Feature/#99 bootstrap unit tests and updates for site and quality (#118) * #99 bootstrap test * #99 should fix the build * #99 should force the test case * #99 typo * #99 bootstrap tests * #128 fix for site issues on windows machines (#130) * Bug/#129 documentation and fixes for most gradle versions (#133) * #129 looks like the matrix switcher was never called from travis, uh oh * #129 looks like the matrix switcher was never called from travis, uh oh * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues, possible fix for gradle 3.0 * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 and more items to the build matrix * #129 and more items to the build matrix * #129 and more items to the build matrix * #129 the build matrix has you * #129 the build matrix has you * #129 the build matrix has you * Release/1.0.15 (#135) * readme update * readme update * prep for release * prepare for next dev cycle * readme update * #138 fixed (#140) * prepare for next dev cycle (#142) * readme update * readme update * readme update * readme update * readme update * Release/v1.0.16 (#141) * prepare for next dev cycle * Feature/#103 (#111) * #103 adding analyzers for most reports in the form of errors and warnings * #108 fixed * Bug/#119 (#120) failed to compile due to hard coded configuration names #119 should resolve this * #119 potential fix * Feature/#116 site boostrap (#117) * #116 initial test * #116 site bootstrap * #114 done (#121) #90 done * #123 fix for site bootstrap bootstrapping all the time (#126) #124 gradle dependency report #125 site sample cleanup * Feature/#99 bootstrap unit tests and updates for site and quality (#118) * #99 bootstrap test * #99 should fix the build * #99 should force the test case * #99 typo * #99 bootstrap tests * #128 fix for site issues on windows machines (#130) * Bug/#129 documentation and fixes for most gradle versions (#133) * #129 looks like the matrix switcher was never called from travis, uh oh * #129 looks like the matrix switcher was never called from travis, uh oh * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues, possible fix for gradle 3.0 * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 should fix at least some travis issues * #129 and more items to the build matrix * #129 and more items to the build matrix * #129 and more items to the build matrix * #129 the build matrix has you * #129 the build matrix has you * #129 the build matrix has you * Release/1.0.15 (#135) * readme update * readme update * prep for release * prepare for next dev cycle * readme update * #138 fixed (#140) * prepare for release * #143 fixed (#145) #139 fixed and #145 * #147 fixed (#148) * #146 fixed (#149) * Feature/#152 dex report (#155) * #152 progress on the dex count plugin * #152 with dex count reports * Bug/#144 and #21 (#151) * #144 some progress but not a solution * #144 duplicate dependencies scope/type fixes #21 types added to the best that we can * #144 duplicate dependencies scope/type fixes #21 types added to the best that we can * #144 duplicate dependencies scope/type fixes #21 types added to the best that we can * #144 travis fix * #144 travis fix * #144 travis fix * #144 toning down the logs
chrisdoyle · Oct 11, 2016 · 6a531bd · 6a531bd
1 parent a31f394
commit 6a531bd
Show file tree

Hide file tree

Showing 56 changed files with 11,744 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,4 +59,5 @@ proguard-mapping.txt
 proguard-seeds.txt
 proguard-usage.txt
 
-docs/**
+docs/**
+**/fury-backup/**
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,8 @@ android:
     - addon-google_apis-google-19
     - addon-google_apis-google-23
 env:
-  - GRADLE_VERSION='3.1' GRADLE_PLUGIN_VERSION='2.2.0'
-  - GRADLE_VERSION='3.0' GRADLE_PLUGIN_VERSION='2.2.0'
+  - GRADLE_VERSION='3.1' GRADLE_PLUGIN_VERSION='2.2.1'
+  - GRADLE_VERSION='3.0' GRADLE_PLUGIN_VERSION='2.2.1'
   - GRADLE_VERSION='2.14.1' GRADLE_PLUGIN_VERSION='2.1.3'
   - GRADLE_VERSION='2.10' GRADLE_PLUGIN_VERSION='2.1.2'
   - GRADLE_VERSION='2.14' GRADLE_PLUGIN_VERSION='2.1.0'
@@ -168,6 +168,7 @@ script:
   - cd GradleBootstrap
   - ./gradlew bootstrap
   - ./gradlew install -Pprofile=javadocs,sources
+  # FIXME uncomment this when #147 is merged and a version is cut- ./gradlew site
   #build using maven with integration tests
   #we build 3 times due to issues with the maven-android-plugin. root cause is unknown but seems to be related to how artifacts are resolved for android projects
   #in case you're wondering -fn means fail never, which loosely means, if the build fails, the exit code is always 0, which is basically all CI engines look for.

diff --git a/gradle-fury-validation/src/main/java/com/chrisdoyle/validation/Main.java b/gradle-fury-validation/src/main/java/com/chrisdoyle/validation/Main.java
@@ -45,6 +45,7 @@ public class Main {
             Test_Issue46.class,
             Test_Issue51.class,
             Test_Issue59.class,
+            Test_Issue144.class,
     };
 
     /**

diff --git a/gradle-fury-validation/src/main/java/com/chrisdoyle/validation/tests/Test_Issue144.java b/gradle-fury-validation/src/main/java/com/chrisdoyle/validation/tests/Test_Issue144.java
@@ -0,0 +1,46 @@
+package com.chrisdoyle.validation.tests;
+
+import com.chrisdoyle.validation.Main;
+
+import org.apache.maven.pom._4_0.Dependency;
+import org.apache.maven.pom._4_0.Model;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import javax.xml.bind.JAXB;
+
+/**
+ * Created by alex on 10/10/16.
+ */
+public class Test_Issue144 {
+
+    @Test
+    public void validatePom() throws Exception {
+        for (int i=0; i < Main.allPoms.length; i++) {
+            Model project = JAXB.unmarshal(new File(Main.allPoms[i]), Model.class);
+            Assert.assertNotNull(project);
+        }
+    }
+
+    @Test
+    public void testExclusions() throws Exception{
+        for (int i=0; i < Main.allPoms.length; i++) {
+            if (Main.allPoms[i].contains("hello-world-apk")) {
+                Model project = JAXB.unmarshal(new File(Main.allPoms[i]), Model.class);
+                Assert.assertNotNull(project);
+                for (int k=0; k < project.getDependencies().getDependency().size(); k++){
+                    Dependency dependency = project.getDependencies().getDependency().get(k);
+                    if (dependency.getGroupId().equals("ch.acra") &&
+                            dependency.getArtifactId().equals("acra")){
+                        Assert.assertNotNull("no exclusions were present", dependency.getExclusions());
+                        Assert.assertEquals("no exclusions were present", 1,dependency.getExclusions().getExclusion().size());
+                    }
+
+                }
+            }
+        }
+    }
+}
diff --git a/gradle-fury-validation/src/main/java/com/chrisdoyle/validation/tests/Test_Issue38.java b/gradle-fury-validation/src/main/java/com/chrisdoyle/validation/tests/Test_Issue38.java
@@ -25,7 +25,7 @@ public void testPomDependencyScope() throws Exception {
         //#test
         "<dependency>\\s*<groupId>junit</groupId>\\s*<artifactId>junit</artifactId>\\s*<scope>test</scope>" ,
         //compile
-        "<dependency>\\s*<groupId>org.osmdroid</groupId>\\s*<artifactId>osmdroid-android</artifactId>\\s*<scope>compile</scope>"
+        //"<dependency>\\s*<groupId>org.osmdroid</groupId>\\s*<artifactId>osmdroid-android</artifactId>\\s*<scope>compile</scope>"
 
         };
 
@@ -44,4 +44,29 @@ public void testPomDependencyScope() throws Exception {
         }
 
     }
+
+    @Test
+    public void testPomDependencyScopeAAR() throws Exception {
+
+        String[] search = new String[]{
+                //compile and type
+                "<dependency>\\s*<groupId>org.osmdroid</groupId>\\s*<artifactId>osmdroid-android</artifactId>\\s*<scope>compile</scope>\\s*<version>5.4.1</version>\\s*<type>aar</type>"
+
+        };
+
+
+        for (int i = 0; i < Main.allPoms.length; i++) {
+            if (Main.allPoms[i].contains("hello-world-aar/")) {
+                File f = new File(Main.allPoms[i]);
+
+                String str = FileUtils.readFileToString(f, "utf-8");
+                for (int k = 0; k < search.length; k++) {
+                    Pattern p = Pattern.compile(search[k]);
+                    Matcher matcher = p.matcher(str);
+                    Assert.assertTrue(search[k] + " not found in " + f.getAbsolutePath(), matcher.find());
+                }
+            }
+        }
+
+    }
 }
diff --git a/gradle-fury-validation/src/main/java/org/apache/maven/pom/_4_0/Activation.java b/gradle-fury-validation/src/main/java/org/apache/maven/pom/_4_0/Activation.java
@@ -0,0 +1,178 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2016.10.10 at 08:12:52 AM EDT 
+//
+
+
+package org.apache.maven.pom._4_0;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * The conditions within the build runtime environment which will trigger the
+ *         automatic inclusion of the build profile. Multiple conditions can be defined, which must
+ *         be all satisfied to activate the profile.
+ *       
+ * 
+ * <p>Java class for Activation complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Activation">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;all>
+ *         &lt;element name="activeByDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="jdk" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="os" type="{http://maven.apache.org/POM/4.0.0}ActivationOS" minOccurs="0"/>
+ *         &lt;element name="property" type="{http://maven.apache.org/POM/4.0.0}ActivationProperty" minOccurs="0"/>
+ *         &lt;element name="file" type="{http://maven.apache.org/POM/4.0.0}ActivationFile" minOccurs="0"/>
+ *       &lt;/all>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Activation", propOrder = {
+
+})
+public class Activation {
+
+    @XmlElement(defaultValue = "false")
+    protected Boolean activeByDefault;
+    protected String jdk;
+    protected ActivationOS os;
+    protected ActivationProperty property;
+    protected ActivationFile file;
+
+    /**
+     * Gets the value of the activeByDefault property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isActiveByDefault() {
+        return activeByDefault;
+    }
+
+    /**
+     * Sets the value of the activeByDefault property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setActiveByDefault(Boolean value) {
+        this.activeByDefault = value;
+    }
+
+    /**
+     * Gets the value of the jdk property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getJdk() {
+        return jdk;
+    }
+
+    /**
+     * Sets the value of the jdk property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setJdk(String value) {
+        this.jdk = value;
+    }
+
+    /**
+     * Gets the value of the os property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActivationOS }
+     *     
+     */
+    public ActivationOS getOs() {
+        return os;
+    }
+
+    /**
+     * Sets the value of the os property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActivationOS }
+     *     
+     */
+    public void setOs(ActivationOS value) {
+        this.os = value;
+    }
+
+    /**
+     * Gets the value of the property property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActivationProperty }
+     *     
+     */
+    public ActivationProperty getProperty() {
+        return property;
+    }
+
+    /**
+     * Sets the value of the property property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActivationProperty }
+     *     
+     */
+    public void setProperty(ActivationProperty value) {
+        this.property = value;
+    }
+
+    /**
+     * Gets the value of the file property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActivationFile }
+     *     
+     */
+    public ActivationFile getFile() {
+        return file;
+    }
+
+    /**
+     * Sets the value of the file property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActivationFile }
+     *     
+     */
+    public void setFile(ActivationFile value) {
+        this.file = value;
+    }
+
+}