Merge branch 'gradle' into 'master'

Gradle!



See merge request !6
This commit is contained in:
halfdan committed 2015-12-10 19:52:02 +01:00
commit 6890faf056
860 files changed
+45 -123

No files matched your search

+2
View File
@@ -6,6 +6,8 @@ out/
.project
.classpath
.idea
.gradle
gradle/
EvA2.iml
*.aux
*.log
+11
View File
@@ -0,0 +1,11 @@
test:
script:
- uname -a
- "gradle test --info"
tags:
- java
- gradle
cache:
paths:
- ".gradle/"
+32
View File
@@ -0,0 +1,32 @@
apply plugin: 'java'
apply plugin: 'maven'
group = 'eva2'
version = '2.2.0'
description = """EvA2"""
sourceCompatibility = 1.8
targetCompatibility = 1.8
//create a single Jar with all dependencies
task fatJar(type: Jar) {
manifest {
attributes 'Implementation-Title': 'Gradle Jar File Example',
'Implementation-Version': version,
'Main-Class': 'eva2.gui.Main'
}
baseName = project.name + '-all'
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
with jar
}
repositories {
mavenCentral()
}
dependencies {
compile group: 'javax.help', name: 'javahelp', version:'2.0.05'
compile group: 'org.yaml', name: 'snakeyaml', version:'1.14'
testCompile group: 'junit', name: 'junit', version:'4.11'
}
-120
View File
@@ -1,120 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>eva2</groupId>
<artifactId>EvA2</artifactId>
<packaging>jar</packaging>
<version>2.2.0</version>
<name>EvA2</name>
<url>http://www.ra.cs.uni-tuebingen.de/software/EvA2/</url>
<description>EvA2 (an Evolutionary Algorithms framework, revised version 2) is a comprehensive heuristic optimization framework with emphasis on Evolutionary Algorithms implemented in Java. It is a revised version of the JavaEvA optimization toolbox, which has been developed as a resumption of the former EvA software package.</description>
<scm>
<connection>scm:git:https://gitlab.cs.uni-tuebingen.de/eva2/eva2.git</connection>
<developerConnection>scm:git:https://gitlab.cs.uni-tuebingen.de/eva2/eva2.git</developerConnection>
<url>https://gitlab.cs.uni-tuebingen.de/eva2/eva2</url>
</scm>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
<version>2.0.05</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.14</version>
</dependency>
</dependencies>
<build>
<directory>${project.basedir}/build</directory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<finalName>${project.artifactId}-${project.version}</finalName>
<sourceDirectory>${project.basedir}/src</sourceDirectory>
<testSourceDirectory>${project.basedir}/test</testSourceDirectory>
<resources>
<resource>
<directory>${project.basedir}/resources</directory>
</resource>
</resources>
<plugins>
<!-- Adds archive plugin to set archiving settings including main class -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<index>true</index>
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>eva2.gui.Main</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>eva2.gui.Main</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<!-- Default file encoding is UTF-8 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<licenses>
<license>
<name>GNU LGPL v2.1</name>
<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
<distribution>repo</distribution>
<comments>GNU Lesser General Public License, version 2.1</comments>
</license>
</licenses>
<organization>
<name>Department for Cognitive Systems, University of Tuebingen, Germany</name>
<url>http://www.cogsys.cs.uni-tuebingen.de/</url>
</organization>
</project>
-3
View File
@@ -1,3 +0,0 @@
Manifest-Version: 1.0
Main-Class: eva2.gui.Main
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 860 files, more files were not shown because too many files have changed in this diff. Show more