Skip to content

Commit 5076d76

Browse files
fehguyfehguy
committed
updated scripts to detect scala version and use appropriate library if possible
1 parent 044621b commit 5076d76

22 files changed

+93
-148
lines changed

‎bin/android-java-petstore.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2526
ags="$@ samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/csharp-petstore.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2526
ags="$@ samples/client/petstore/csharp/CsharpPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/flash-petstore.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -21,14 +22,11 @@ cd $APP_DIR
2122

2223

2324
# if you've executed sbt assembly previously it will use that instead.
24-
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files"
25+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties "
2526
ags="$@ samples/client/petstore/flash/FlashPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi

‎bin/java-petstore-filemap.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DfileMap=src/test/resources/petstore-1.1/resources.json -DloggerPath=conf/log4j.properties"
2526
ags="$@ samples/client/petstore/java/JavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/java-petstore.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2526
ags="$@ samples/client/petstore/java/JavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/java-wordnik-api.sh‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -21,15 +22,11 @@ cd $APP_DIR
2122

2223

2324
# if you've executed sbt assembly previously it will use that instead.
24-
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files"
25+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files/resources.json"
2526
ags="$@ samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/objc-petstore.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
5+
6+
version="$(scala ./bin/Version.scala)"
47

58
while [ -h "$SCRIPT" ] ; do
69
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +27,8 @@ cd $APP_DIR
2427
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2528
ags="$@ samples/client/petstore/objc/ObjcPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2629

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
30+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
31+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3132
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
33+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3434
fi
35-

‎bin/objc-wordnik-api.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files"
2526
ags="$@ samples/client/wordnik-api/objc/ObjcWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/php-petstore.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2526
ags="$@ samples/client/petstore/php/PHPPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

‎bin/php-wordnik-api.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
SCRIPT="$0"
4+
SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
45

56
while [ -h "$SCRIPT" ] ; do
67
ls=`ls -ld "$SCRIPT"`
@@ -24,12 +25,8 @@ cd $APP_DIR
2425
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files"
2526
ags="$@ samples/client/wordnik-api/php/PHPWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
2627

27-
if [ -f $APP_DIR/target/scala-2.9.1/swagger-codegen.jar ]; then
28-
scala -cp target/scala-2.9.1/swagger-codegen.jar $ags
29-
elif [[ -f $APP_DIR/target/scala-2.10/swagger-codegen.jar ]]; then
30-
scala -cp target/scala-2.10/swagger-codegen.jar $ags
28+
if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
29+
scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
3130
else
32-
./sbt assembly
33-
scala -cp target/swagger-codegen.jar $ags
31+
echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
3432
fi
35-

0 commit comments

Comments
 (0)