Skip to content

Commit

Permalink
Merge pull request #1 from mvniekerk/flamingo-5.2
Browse files Browse the repository at this point in the history 
Get flamingobuilder to compile with flamingo-5.2
  • Loading branch information
@aalmiray
aalmiray committed May 23, 2017
2 parents 08995f4 + d59e37a commit 3226477
Show file tree
Hide file tree
Showing 36 changed files with 172 additions and 386 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -1,2 +1,3 @@
.gradle
build
.idea
141 changes: 29 additions & 112 deletions build.gradle
View file
Expand Up @@ -20,58 +20,49 @@ apply plugin: 'maven'
sourceCompatibility = '1.5'
targetCompatibility = '1.5'
archivesBaseName = 'flamingobuilder'
version="0.6.0-SNAPSHOT"

configurations {
deployerJars
}

repositories {
flatDir(dirs: file('src/lib'))
jcenter()
mavenCentral()
mavenRepo url: 'http://repository.sonatype.org/content/groups/public/'
mavenRepo url: 'https://repository.jboss.org/nexus/content/groups/public-jboss'
// mavenRepo url: 'http://repository.sonatype.org/content/groups/public/'
// mavenRepo url: 'https://repository.jboss.org/nexus/content/groups/public-jboss'
}

dependencies {
groovy "org.codehaus.groovy:groovy-all:$groovyVersion"
compile "org.codehaus.groovy:groovy-all:$groovyVersion",
'org.pushingpixels:flamingo:4.1',
'xml-apis:xml-apis-ext:1.3.04',
'batik:batik-anim:1.7',
'batik:batik-awt-util:1.7',
'batik:batik-bridge:1.7',
'batik:batik-codec:1.7',
'batik:batik-css:1.7',
'batik:batik-dom:1.7',
'batik:batik-ext:1.7',
'batik:batik-extension:1.7',
'batik:batik-gui-util:1.7',
'batik:batik-gvt:1.7',
'batik:batik-parser:1.7',
'batik:batik-script:1.7',
'batik:batik-svg-dom:1.7',
'batik:batik-svggen:1.7',
'batik:batik-swing:1.7',
'batik:batik-transcoder:1.7',
'batik:batik-util:1.7',
'batik:batik-xml:1.7'
def batik="1.9"
compile "org.codehaus.groovy:groovy-all:2.4.11"
compile 'org.pushingpixels:flamingo:5.2.00-dev'
compile 'xml-apis:xml-apis-ext:1.3.04'

compile "org.apache.xmlgraphics:batik-anim:$batik"
compile "org.apache.xmlgraphics:batik-awt-util:$batik"
compile "org.apache.xmlgraphics:batik-bridge:$batik"
compile "org.apache.xmlgraphics:batik-codec:$batik"
compile "org.apache.xmlgraphics:batik-css:$batik"
compile "org.apache.xmlgraphics:batik-dom:$batik"
compile "org.apache.xmlgraphics:batik-ext:$batik"
compile "org.apache.xmlgraphics:batik-extension:$batik"
compile "org.apache.xmlgraphics:batik-gui-util:$batik"
compile "org.apache.xmlgraphics:batik-gvt:$batik"
compile "org.apache.xmlgraphics:batik-parser:$batik"
compile "org.apache.xmlgraphics:batik-script:$batik"
compile "org.apache.xmlgraphics:batik-svg-dom:$batik"
compile "org.apache.xmlgraphics:batik-svggen:$batik"
compile "org.apache.xmlgraphics:batik-swing:$batik"
compile "org.apache.xmlgraphics:batik-transcoder:$batik"
compile "org.apache.xmlgraphics:batik-util:$batik"
compile "org.apache.xmlgraphics:batik-xml:$batik"
testCompile "junit:junit:4.8.2"
deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2',
'org.apache.maven:maven-ant-tasks:2.1.0'
// deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2',
// 'org.apache.maven:maven-ant-tasks:2.1.0'
}

configure([compileGroovy, compileTestGroovy]) {
groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G')
groovyOptions.encoding = "UTF-8"
}

configure([compileJava, compileTestJava]) {
options.deprecation = true
options.debug = true
}

metaInf << fileTree(dir: file('.'), includes: ['LICENSE.txt'])

jar {
manifest {
attributes(
Expand Down Expand Up @@ -118,81 +109,7 @@ task fullDist(dependsOn: [jar, zipSource, tarSource]) {
description = "Assembles all packages."
}

task wrapper(type: Wrapper) {
gradleVersion = '1.0-milestone-6'
jarFile = 'gradle/wrapper/gradle-wrapper.jar'
}

artifacts {
archives jar
}

installer = install.repositories.mavenInstaller
def deployer = null

if(!project.hasProperty('codehausUsername')) codehausUsername = ''
if(!project.hasProperty('codehausPassword')) codehausPassword = ''

uploadArchives {
repositories {
deployer = mavenDeployer {
name = 'codehausDeployer'
configuration = configurations.deployerJars
uploadDescriptor = true
repository(url: codehausReleaseUrl) {
authentication(userName: codehausUsername, password: codehausPassword)
}
snapshotRepository(url: codehausSnapshotUrl) {
uniqueVersion = false
authentication(userName: codehausUsername, password: codehausPassword)
}
}
}
}

[installer, deployer].each { repo ->
configure(repo) {
pom.project {
name 'FlamingoBuilder'
description 'FlamingoBuilder: building UIs with Groovy/Flamingo'
url('http://griffon.codehaus.org/FlamingoBuilder')
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}
}/*
distributionManagement {
repository {
id('codehaus.org')
name('Griffon Central Repository')
url('dav:https://dav.codehaus.org/repository/griffon/')
}
snapshotRepository {
uniqueVersion('false')
id('codehaus.org')
name('Griffon Central Development Repository')
url('dav:https://dav.codehaus.org/snapshots.repository/griffon/')
}
}*/
repositories {
repository {
id('codehaus-release')
name('Codehaus')
url('http://repository.codehaus.org')
}
repository {
id('sonatype-release')
name('Sonatype')
url('http://repository.sonatype.org/content/groups/public')
}
repository {
id('jboss-release')
name('JBoss')
url('https://repository.jboss.org/nexus/content/groups/public-jboss')
}
}
}
}
}
6 changes: 0 additions & 6 deletions gradle.properties
View file

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
@@ -1,6 +1,6 @@
#Mon Feb 13 14:02:36 CET 2012
#Sun May 21 16:11:31 SAST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
81 changes: 44 additions & 37 deletions gradlew
View file
@@ -1,17 +1,35 @@
#!/bin/bash
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -40,31 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/"
APP_HOME="`pwd -P`"
cd "$SAVED"

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
Expand All @@ -90,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
Expand All @@ -101,20 +100,20 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add APP_NAME to the JAVA_OPTS as -Xdock:name
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
JAVA_OPTS="$JAVA_OPTS -Xdock:name=$APP_NAME"
# we may also want to set -Xdock:image
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down Expand Up @@ -155,11 +154,19 @@ if $cygwin ; then
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
14 changes: 4 additions & 10 deletions gradlew.bat
View file
Expand Up @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

Expand Down Expand Up @@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
Expand All @@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line
Expand Down
Binary file removed src/lib/flamingo-4.1.jar
View file
Binary file not shown.
Binary file added src/lib/flamingo-5.2.00-dev.jar
View file
Binary file not shown.

0 comments on commit 3226477

Please sign in to comment.