Merge pull request TNG#267 from TNG/revert-shadow

Revert use of shadow plugin
Airblader · Dec 24, 2016 · 0ab8714 · 0ab8714
2 parents f9ba66b + fae0f3c
commit 0ab8714
Show file tree

Hide file tree

Showing 94 changed files with 251 additions and 429 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,5 @@
 # v0.14.0
 
-## Removal of Library Dependencies
-
-JGiven does not directly depend on any libraries anymore, except for `slf4j`. All other dependencies like `Guava`,
-
 ## Switch from cglib to ByteBuddy
 
 The internal JGiven interception mechanism was changed to use ByteBuddy instead of cglib. The main reason for this change is support for Android (see below).

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
     dependencies {
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
-        classpath 'net.sf.proguard:proguard-gradle:5.3.1'
     }
 }
 
@@ -16,7 +15,6 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.13.0'
     id "org.sonarqube" version "2.0.1"
     id "ru.vyarus.animalsniffer" version "1.2.0"
-    id 'com.github.johnrengelman.shadow' version '1.2.3'
 }
 
 apply plugin: 'com.github.kt3k.coveralls'
@@ -26,7 +24,7 @@ apply plugin: 'project-report'
 description = 'JGiven - BDD in plain Java'
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.1'
+    gradleVersion = '3.2'
 }
 
 allprojects {
@@ -92,7 +90,7 @@ configure(subprojects.findAll {!it.name.contains("android")}) {
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                from project.name == 'jgiven-core' ? components.shadow : components.java
+                from components.java
             }
         }
     }
@@ -114,22 +112,20 @@ configure(subprojects.findAll {!it.name.contains("android")}) {
         options.encoding = 'UTF-8'
     }
 
-    jar {
-        manifest {
-            attributes(
+    tasks.withType(Jar) {
+        def now = new Date()
+        manifest = project.manifest().attributes(
                 'Built-By': "Gradle ${gradle.gradleVersion}",
-                'Build-Date': new Date().format('yyyy-MM-dd HH:mm:ss.S'),
-                // TODO destroys incremental build feature, but maybe date without time is ok as well?
-                'Copyright': "2013-" + new Date().format('yyyy') + " TNG Technology Consulting GmbH",
+                'Build-Date': now.format('yyyy-MM-dd HH:mm:ss.S'), // TODO destroys incremental build feature, but maybe date without time is ok as well?
+                'Copyright': "2013-" + now.format('yyyy') + " TNG Technology Consulting GmbH",
                 'Implementation-Title': project.name,
                 'Implementation-Version': project.version,
                 'Implementation-Vendor': 'TNG Technology Consulting GmbH',
                 'License': 'Apache License v2.0, January 2004',
                 'Specification-Title': project.name,
                 'Specification-Version': project.version,
                 'Specification-Vendor': 'TNG Technology Consulting GmbH',
-            )
-        }
+        )
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 02 15:56:27 CET 2016
+#Fri Dec 23 09:50:42 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
diff --git a/jgiven-android-test/build.gradle b/jgiven-android-test/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
     }
 }
 apply plugin: 'com.android.application'

diff --git a/jgiven-android/build.gradle b/jgiven-android/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/jgiven-core/build.gradle b/jgiven-core/build.gradle
@@ -1,28 +1,10 @@
-apply plugin: 'com.github.johnrengelman.shadow'
-
 description = "JGiven core module"
 
 dependencies {
-    compile project(path: ':jgiven-deps', configuration: 'shadow')
-}
-
-shadowJar {
-    classifier = ''
-}
-
-idea {
-    module {
-        scopes.COMPILE.plus += [configurations.shadow]
-
-        iml {
-            whenMerged { module ->
-                    def dep = new org.gradle.plugins.ide.idea.model.ModuleLibrary(
-                            [new org.gradle.plugins.ide.idea.model.Path('file://$MODULE_DIR$/../jgiven-deps/build/libs/jgiven-deps.jar')],
-                            [], [], [], 'COMPILE')
-                    dep.exported = true
-                    module.dependencies.add(dep)
-            }
-        }
-    }
+    compile group: 'com.google.guava', name: 'guava', version: guavaVersion
+    compile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
+    compile group: 'com.thoughtworks.paranamer', name: 'paranamer', version: paranamerVersion
+    compile group: 'net.bytebuddy', name: 'byte-buddy', version: bytebuddyVersion
+    compile group: 'org.fusesource.jansi', name: 'jansi', version: jansiVersion
 }
 
diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/DataTables.java b/jgiven-core/src/main/java/com/tngtech/jgiven/DataTables.java
@@ -2,7 +2,7 @@
 
 import java.util.Arrays;
 
-import com.tngtech.jgiven.relocated.guava.collect.Iterables;
+import com.google.common.collect.Iterables;
 
 /**
  * A utility class to create data tables.

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/annotation/As.java b/jgiven-core/src/main/java/com/tngtech/jgiven/annotation/As.java
@@ -2,7 +2,6 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/attachment/Attachment.java b/jgiven-core/src/main/java/com/tngtech/jgiven/attachment/Attachment.java
@@ -1,9 +1,9 @@
 package com.tngtech.jgiven.attachment;
 
-import com.tngtech.jgiven.relocated.guava.io.BaseEncoding;
-import com.tngtech.jgiven.relocated.guava.io.ByteStreams;
-import com.tngtech.jgiven.relocated.guava.io.CharStreams;
-import com.tngtech.jgiven.relocated.guava.io.Files;
+import com.google.common.io.BaseEncoding;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.CharStreams;
+import com.google.common.io.Files;
 import com.tngtech.jgiven.exception.JGivenWrongUsageException;
 import com.tngtech.jgiven.impl.util.ResourceUtil;
 

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/base/ScenarioTestBase.java b/jgiven-core/src/main/java/com/tngtech/jgiven/base/ScenarioTestBase.java
@@ -1,6 +1,6 @@
 package com.tngtech.jgiven.base;
 
-import com.tngtech.jgiven.relocated.guava.reflect.TypeToken;
+import com.google.common.reflect.TypeToken;
 import com.tngtech.jgiven.impl.Scenario;
 import com.tngtech.jgiven.impl.ScenarioBase;
 import com.tngtech.jgiven.integration.CanWire;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/base/SimpleScenarioTestBase.java b/jgiven-core/src/main/java/com/tngtech/jgiven/base/SimpleScenarioTestBase.java
@@ -1,6 +1,6 @@
 package com.tngtech.jgiven.base;
 
-import com.tngtech.jgiven.relocated.guava.reflect.TypeToken;
+import com.google.common.reflect.TypeToken;
 import com.tngtech.jgiven.impl.Scenario;
 
 /**

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/config/AbstractJGivenConfiguration.java b/jgiven-core/src/main/java/com/tngtech/jgiven/config/AbstractJGivenConfiguration.java
@@ -3,7 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
-import com.tngtech.jgiven.relocated.guava.collect.Maps;
+import com.google.common.collect.Maps;
 import com.tngtech.jgiven.format.Formatter;
 import com.tngtech.jgiven.impl.format.FormatterCache;
 

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/config/ConfigurationUtil.java b/jgiven-core/src/main/java/com/tngtech/jgiven/config/ConfigurationUtil.java
@@ -2,10 +2,10 @@
 
 import java.util.concurrent.ExecutionException;
 
-import com.tngtech.jgiven.relocated.guava.base.Throwables;
-import com.tngtech.jgiven.relocated.guava.cache.CacheBuilder;
-import com.tngtech.jgiven.relocated.guava.cache.CacheLoader;
-import com.tngtech.jgiven.relocated.guava.cache.LoadingCache;
+import com.google.common.base.Throwables;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.tngtech.jgiven.annotation.JGivenConfiguration;
 import com.tngtech.jgiven.impl.util.ReflectionUtil;
 

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/config/TagConfiguration.java b/jgiven-core/src/main/java/com/tngtech/jgiven/config/TagConfiguration.java
@@ -1,6 +1,6 @@
 package com.tngtech.jgiven.config;
 
-import com.tngtech.jgiven.relocated.guava.collect.Lists;
+import com.google.common.collect.Lists;
 import com.tngtech.jgiven.annotation.TagDescriptionGenerator;
 import com.tngtech.jgiven.annotation.TagHrefGenerator;
 import com.tngtech.jgiven.impl.tag.DefaultTagDescriptionGenerator;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/format/table/DefaultTableFormatter.java b/jgiven-core/src/main/java/com/tngtech/jgiven/format/table/DefaultTableFormatter.java
@@ -6,8 +6,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.tngtech.jgiven.relocated.guava.collect.ImmutableList;
-import com.tngtech.jgiven.relocated.guava.collect.Lists;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import com.tngtech.jgiven.annotation.Table;
 import com.tngtech.jgiven.config.FormatterConfiguration;
 import com.tngtech.jgiven.exception.JGivenWrongUsageException;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/format/table/FieldBasedRowFormatter.java b/jgiven-core/src/main/java/com/tngtech/jgiven/format/table/FieldBasedRowFormatter.java
@@ -5,11 +5,11 @@
 import java.util.List;
 import java.util.Set;
 
-import com.tngtech.jgiven.relocated.guava.base.Function;
-import com.tngtech.jgiven.relocated.guava.base.Predicate;
-import com.tngtech.jgiven.relocated.guava.collect.FluentIterable;
-import com.tngtech.jgiven.relocated.guava.collect.Lists;
-import com.tngtech.jgiven.relocated.guava.collect.Sets;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.tngtech.jgiven.annotation.Table;
 import com.tngtech.jgiven.config.FormatterConfiguration;
 import com.tngtech.jgiven.format.DefaultFormatter;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/format/table/PlainRowFormatter.java b/jgiven-core/src/main/java/com/tngtech/jgiven/format/table/PlainRowFormatter.java
@@ -3,7 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import com.tngtech.jgiven.relocated.guava.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import com.tngtech.jgiven.annotation.Table;
 import com.tngtech.jgiven.config.FormatterConfiguration;
 import com.tngtech.jgiven.format.ObjectFormatter;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ByteBuddyStageCreator.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ByteBuddyStageCreator.java
@@ -1,15 +1,15 @@
 package com.tngtech.jgiven.impl;
 
-import static com.tngtech.jgiven.relocated.bytebuddy.matcher.ElementMatchers.any;
+import static net.bytebuddy.matcher.ElementMatchers.any;
 
 import com.tngtech.jgiven.impl.intercept.ByteBuddyMethodInterceptor;
 import com.tngtech.jgiven.impl.intercept.StageInterceptorInternal;
 import com.tngtech.jgiven.impl.intercept.StepInterceptor;
 
-import com.tngtech.jgiven.relocated.bytebuddy.ByteBuddy;
-import com.tngtech.jgiven.relocated.bytebuddy.dynamic.loading.ClassLoadingStrategy;
-import com.tngtech.jgiven.relocated.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.MethodDelegation;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
+import net.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
+import net.bytebuddy.implementation.MethodDelegation;
 
 public class ByteBuddyStageCreator implements StageCreator {
 

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/Config.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/Config.java
@@ -1,6 +1,6 @@
 package com.tngtech.jgiven.impl;
 
-import com.tngtech.jgiven.relocated.guava.base.Optional;
+import com.google.common.base.Optional;
 import com.tngtech.jgiven.config.ConfigValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioExecutor.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioExecutor.java
@@ -1,7 +1,7 @@
 package com.tngtech.jgiven.impl;
 
-import static com.tngtech.jgiven.relocated.guava.collect.Lists.newArrayList;
-import static com.tngtech.jgiven.relocated.guava.collect.Lists.reverse;
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Lists.reverse;
 import static com.tngtech.jgiven.impl.ScenarioExecutor.State.FINISHED;
 import static com.tngtech.jgiven.impl.ScenarioExecutor.State.STARTED;
 
@@ -14,9 +14,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.tngtech.jgiven.relocated.guava.base.Optional;
-import com.tngtech.jgiven.relocated.guava.collect.Lists;
-import com.tngtech.jgiven.relocated.guava.collect.Maps;
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.tngtech.jgiven.CurrentScenario;
 import com.tngtech.jgiven.CurrentStep;
 import com.tngtech.jgiven.annotation.AfterScenario;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioModelBuilder.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioModelBuilder.java
@@ -12,11 +12,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.tngtech.jgiven.relocated.guava.base.Optional;
-import com.tngtech.jgiven.relocated.guava.base.Strings;
-import com.tngtech.jgiven.relocated.guava.collect.ImmutableSet;
-import com.tngtech.jgiven.relocated.guava.collect.Iterables;
-import com.tngtech.jgiven.relocated.guava.collect.Lists;
+import com.google.common.base.Optional;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.tngtech.jgiven.annotation.As;
 import com.tngtech.jgiven.annotation.AsProvider;
 import com.tngtech.jgiven.annotation.CaseDescription;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/format/FormatterCache.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/format/FormatterCache.java
@@ -3,11 +3,11 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import com.tngtech.jgiven.relocated.guava.base.Throwables;
-import com.tngtech.jgiven.relocated.guava.cache.CacheBuilder;
-import com.tngtech.jgiven.relocated.guava.cache.CacheLoader;
-import com.tngtech.jgiven.relocated.guava.cache.LoadingCache;
-import com.tngtech.jgiven.relocated.guava.collect.Maps;
+import com.google.common.base.Throwables;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.Maps;
 import com.tngtech.jgiven.format.DefaultFormatter;
 import com.tngtech.jgiven.format.Formatter;
 

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/format/ParameterFormattingUtil.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/format/ParameterFormattingUtil.java
@@ -4,10 +4,10 @@
 import java.util.List;
 import java.util.Set;
 
-import com.tngtech.jgiven.relocated.guava.base.Throwables;
-import com.tngtech.jgiven.relocated.guava.collect.Iterables;
-import com.tngtech.jgiven.relocated.guava.collect.Lists;
-import com.tngtech.jgiven.relocated.guava.collect.Sets;
+import com.google.common.base.Throwables;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.tngtech.jgiven.annotation.AnnotationFormat;
 import com.tngtech.jgiven.annotation.Format;
 import com.tngtech.jgiven.annotation.Table;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/inject/ValueInjector.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/inject/ValueInjector.java
@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.tngtech.jgiven.relocated.guava.collect.Maps;
+import com.google.common.collect.Maps;
 import com.tngtech.jgiven.annotation.ExpectedScenarioState;
 import com.tngtech.jgiven.annotation.ProvidedScenarioState;
 import com.tngtech.jgiven.annotation.ScenarioState;

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/inject/ValueInjectorState.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/inject/ValueInjectorState.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import com.tngtech.jgiven.relocated.guava.collect.Maps;
+import com.google.common.collect.Maps;
 
 /**
  * Holds values based on their type or name.

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/intercept/ByteBuddyMethodInterceptor.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/intercept/ByteBuddyMethodInterceptor.java
@@ -5,13 +5,13 @@
 
 import com.tngtech.jgiven.impl.intercept.StepInterceptor.Invoker;
 
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.AllArguments;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.BindingPriority;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.DefaultCall;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.Origin;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.RuntimeType;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.SuperCall;
-import com.tngtech.jgiven.relocated.bytebuddy.implementation.bind.annotation.This;
+import net.bytebuddy.implementation.bind.annotation.AllArguments;
+import net.bytebuddy.implementation.bind.annotation.BindingPriority;
+import net.bytebuddy.implementation.bind.annotation.DefaultCall;
+import net.bytebuddy.implementation.bind.annotation.Origin;
+import net.bytebuddy.implementation.bind.annotation.RuntimeType;
+import net.bytebuddy.implementation.bind.annotation.SuperCall;
+import net.bytebuddy.implementation.bind.annotation.This;
 
 /**
  * StepInterceptorImpl that uses ByteBuddy Method interceptor with annotations for intercepting JGiven methods