Exclude bintray.properties from sources
Conflicts:
gradle/assemble.gradle
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 32acd39..baeb38a 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -42,11 +42,25 @@
ext.srcSpec = copySpec {
from(projectDir) {
- exclude 'target', 'subprojects/*/target', 'buildSrc/target', buildDir.path, 'classes/**', 'cruise/**',
- '.clover/*', 'local.build.properties', 'cobertura.ser', 'junitvmwatcher*.properties',
- 'out', '**/*.iml', '**/*.ipr', '**/*.iws', // used by Intellij IDEA
- '.settings', // used by Eclipse
- '.gradle', 'buildSrc/.gradle' // used by Gradle
+ exclude 'target',
+ 'subprojects/*/target',
+ 'buildSrc/target',
+ buildDir.path,
+ 'classes/**',
+ 'cruise/**',
+ '.clover/*',
+ 'local.build.properties',
+ 'cobertura.ser',
+ 'junitvmwatcher*.properties',
+ 'out',
+ 'bintray.properties', // generated by the CI server
+ 'gradle.properties.gz', // generated by the CI server
+ '**/*.iml', // used by Intellij IDEA
+ '**/*.ipr', // used by Intellij IDEA
+ '**/*.iws', // used by Intellij IDEA
+ '.settings', // used by Eclipse
+ '.gradle', // used by Gradle
+ 'buildSrc/.gradle' // used by Gradle
}
}