Skip to content

Commit

Permalink
fix building of ScrollView.jar with modern java version; fixes #1289
Browse files Browse the repository at this point in the history
  • Loading branch information
@nguyenq @zdenop
nguyenq authored and zdenop committed Oct 10, 2018
1 parent 5fac511 commit 9d84968
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions java/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ SCROLLVIEW_CLASSES = \

SCROLLVIEW_LIBS = \
piccolo2d-core-3.0.jar \
piccolo2d-extras-3.0.jar
piccolo2d-extras-3.0.jar \
jaxb-api-2.3.1.jar

CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar:jaxb-api-2.3.1.jar

ScrollView.jar : $(SCROLLVIEW_CLASSES)
$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
Expand All @@ -52,6 +53,7 @@ $(SCROLLVIEW_CLASSES) : $(SCROLLVIEW_FILES) $(SCROLLVIEW_LIBS)
fetch-jars $(SCROLLVIEW_LIBS):
curl -L http://search.maven.org/remotecontent?filepath=org/piccolo2d/piccolo2d-core/3.0/piccolo2d-core-3.0.jar > piccolo2d-core-3.0.jar
curl -L http://search.maven.org/remotecontent?filepath=org/piccolo2d/piccolo2d-extras/3.0/piccolo2d-extras-3.0.jar > piccolo2d-extras-3.0.jar
curl -L http://search.maven.org/remotecontent?filepath=javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar > jaxb-api-2.3.1.jar

.PHONY: install-jars
install-jars : ScrollView.jar
Expand Down
2 changes: 1 addition & 1 deletion java/Manifest.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Main-Class: com/google/scrollview/ScrollView
Class-Path: ScrollView.jar piccolo2d-core-3.0.jar piccolo2d-extras-3.0.jar
Class-Path: ScrollView.jar piccolo2d-core-3.0.jar piccolo2d-extras-3.0.jar jaxb-api-2.3.1.jar

2 comments on commit 9d84968

@amitdo
Copy link
Collaborator

@amitdo amitdo commented on 9d84968 Oct 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason, Travis CI is broken.

@zdenop
Copy link
Contributor

@zdenop zdenop commented on 9d84968 Oct 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there was internal travis problem. After restarting build it was finished without problem

Please sign in to comment.