Skip to content

Commit

Permalink
Release new version
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthieuNICOLAS committed Nov 6, 2015
1 parent 3a14ac9 commit cb1cc98
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/models/GitHubIssueManager.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import play.api.Logger
import java.io.IOException

object GitHubIssueManager {
private val oAuth2Token: String = "toto"
private val oAuth2Token: String = Play.configuration.getString("plm.github.oauth").get
private val repository: String = Play.configuration.getString("plm.github.repo").get
private val owner: String = Play.configuration.getString("plm.github.owner").get
}
Expand Down
2 changes: 1 addition & 1 deletion app/models/PLM.scala
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class PLM(
var _currentExercise: Exercise = _
var _currentLang: Lang = _

var gitUtils = new GitUtils(Play.configuration.getString("plm.github.oauth").getOrElse("dummy-username"))
var gitUtils = new GitUtils(Play.configuration.getString("plm.github.oauth").get)
var game = new Game(initUserUUID, plmLogger, locale, lastProgLang.getOrElse("Java"), gitUtils, trackUser, properties)
var gitGest = new Git(initUserUUID, gitUtils)

Expand Down
26 changes: 26 additions & 0 deletions app/modules/BrowserModule.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package modules

import com.google.inject._
import com.google.inject.AbstractModule
import java.awt.Desktop
import net.codingwell.scalaguice.ScalaModule
import java.net.URI
import play.api.Configuration

/**
* @author matthieu$
*/

class Browser @Inject()(configuration: Configuration) {
if(Desktop.isDesktopSupported)
{
Desktop.getDesktop.browse(new URI("http://localhost:9000"))
}
}


class BrowserModule extends AbstractModule with ScalaModule {
def configure() = {
bind(classOf[Browser]).asEagerSingleton
}
}
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import scalariform.formatter.preferences._

name := "web-PLM"

version := "1.0"
version := "1.2.2"

scalaVersion := "2.11.4"

Expand Down
3 changes: 2 additions & 1 deletion conf/application.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is the main configuration file for the application.
# ~~~~~

application.version = 1.1.0
application.version = 1.2.2

# Secret key
# ~~~~~
Expand All @@ -19,6 +19,7 @@ play.i18n.langs=["en", "fr"]
# The application DI modules
# ~~~~~
play.modules.enabled += "modules.SilhouetteModule"
play.modules.enabled += "modules.BrowserModule"

# Global object class
# ~~~~~
Expand Down

0 comments on commit cb1cc98

Please sign in to comment.