StarMirror/gitpitch
1
0
Fork 0
mirror of https://github.com/gitpitch/gitpitch.git synced 2024-04-18 07:30:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60 from mkurz/updates

Browse Source 
Updated Play, Scala and sbt to latest versions plus deps cleanup.
This commit is contained in:
David Russell 2017-04-28 08:32:13 +07:00 committed by GitHub
commit a082a1e93b
7 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -14,3 +14,6 @@ server.pid
*.eml *.eml
/dist/ /dist/
.cache .cache
.classpath
.project
.settings/

2
build.sbt
View File

@ -4,7 +4,7 @@ organization := "com.gitpitch"
lazy val root = (project in file(".")).enablePlugins(PlayJava) lazy val root = (project in file(".")).enablePlugins(PlayJava)
scalaVersion := "2.11.7" scalaVersion := "2.11.11"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
cache, cache,

4
conf/application.conf
View File

@ -238,7 +238,7 @@ play.filters {
# The allowed origins. If null, all origins are allowed. # The allowed origins. If null, all origins are allowed.
#allowedOrigins = ["http://www.example.com"] #allowedOrigins = ["http://www.example.com"]
allowedOrigins = [".gitpitch.com", "localhost:9000"] allowedOrigins = [".gitpitch.com", "localhost:9000", "127.0.0.1:9000"]
# The allowed HTTP methods. If null, all methods are allowed # The allowed HTTP methods. If null, all methods are allowed
#allowedHttpMethods = ["GET", "POST"] #allowedHttpMethods = ["GET", "POST"]
@ -291,7 +291,7 @@ play.filters {
# This is useful to prevent cache poisoning attacks. # This is useful to prevent cache poisoning attacks.
hosts { hosts {
# Allow requests to example.com, its subdomains, and localhost:9000. # Allow requests to example.com, its subdomains, and localhost:9000.
#allowed = [".example.com", "localhost:9000"] allowed = ["localhost", "127.0.0.1", ".local"]
} }
} }

BIN
libexec/activator-launch-1.3.10.jar
View File

Binary file not shown.

2
project/build.properties
View File

@ -1,4 +1,4 @@
#Activator-generated Properties #Activator-generated Properties
#Mon May 23 13:23:50 ICT 2016 #Mon May 23 13:23:50 ICT 2016
template.uuid=28ae6884-7b61-401c-834c-704789d1228a template.uuid=28ae6884-7b61-401c-834c-704789d1228a
sbt.version=0.13.11 sbt.version=0.13.15

18
project/plugins.sbt
View File

@ -1,20 +1,20 @@
// The Play plugin // The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.3") addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.14")
// Web plugins // Web plugins
addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.0") // addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.0") // addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-jshint" % "1.0.3") // addSbtPlugin("com.typesafe.sbt" % "sbt-jshint" % "1.0.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.7") // addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.7")
addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.0") // addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.1.0") // addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.1.0")
addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.2") // addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.2")
// Play enhancer - this automatically generates getters/setters for public fields // Play enhancer - this automatically generates getters/setters for public fields
// and rewrites accessors of these fields to use the getters/setters. Remove this // and rewrites accessors of these fields to use the getters/setters. Remove this
// plugin if you prefer not to have this feature, or disable on a per project // plugin if you prefer not to have this feature, or disable on a per project
// basis using disablePlugins(PlayEnhancer) in your build.sbt // basis using disablePlugins(PlayEnhancer) in your build.sbt
addSbtPlugin("com.typesafe.sbt" % "sbt-play-enhancer" % "1.1.0") // addSbtPlugin("com.typesafe.sbt" % "sbt-play-enhancer" % "1.1.0")
// Play Ebean support, to enable, uncomment this line, and enable in your build.sbt using // Play Ebean support, to enable, uncomment this line, and enable in your build.sbt using
// enablePlugins(PlayEbean). // enablePlugins(PlayEbean).

2
test/com/gitpitch/FunctionalTest.java
View File

@ -1,3 +1,5 @@
package com.gitpitch;
import org.junit.Test; import org.junit.Test;
import play.Logger; import play.Logger;
import play.libs.ws.*; import play.libs.ws.*;