Fixing shinyBS and shinyRGL importing

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: treescape
 Title: Statistical Exploration of Landscapes of Phylogenetic Trees
-Version: 1.8.14
+Version: 1.8.15
 Authors@R: c(TJ=person("Thibaut", "Jombart", email="[email protected]", role = c("aut")),
      MK=person("Michelle", "Kendall", email="[email protected]", role = c("aut", "cre")),
 	   JAG=person("Jacob", "Almagro-Garcia", role = c("aut")),	
@@ -23,15 +23,15 @@ Imports:
     combinat,
     compiler,
     phangorn,
-    Rcpp
+    Rcpp,
+    shinyBS,
+    shinyRGL
 LinkingTo: Rcpp
 Suggests:
     RColorBrewer,
     ggplot2,
     rgl,
-    testthat,
-    shinyBS,
-    shinyRGL
+    testthat
 License: GPL (>=2)
 LazyData: true
 Collate:

NAMESPACE

@@ -31,6 +31,8 @@ importFrom(graphics,abline)
 importFrom(graphics,plot)
 importFrom(phangorn,Children)
 importFrom(phangorn,Descendants)
+importFrom(shinyBS,bsTooltip)
+importFrom(shinyRGL,webGLOutput)
 importFrom(stats,as.dist)
 importFrom(stats,cutree)
 importFrom(stats,dist)

R/servers.R

@@ -18,6 +18,8 @@
 #' @importFrom phangorn Descendants
 #' @importFrom utils packageDescription
 #' @importFrom RLumShiny jscolorInput
+#' @importFrom shinyBS bsTooltip
+#' @importFrom shinyRGL webGLOutput
 #' 
 #' 
 #' @export

inst/shiny/server.R

@@ -1,6 +1,3 @@
-## library(shiny)
-## library(treescape)
-
 ## DEFINE THE SERVER SIDE OF THE APPLICATION
 shinyServer(function(input, output, session) {
   ## LOAD PACKAGES
@@ -10,8 +7,6 @@ shinyServer(function(input, output, session) {
   if(!require("treescape")) stop("treescape is required")
   if(!require("adegenet")) stop("adegenet is required")
   if(!require("phangorn")) stop("phangorn is required")
-  if(!require("shinyRGL")) stop("shinyRGL is required")
-  if(!require("shinyBS")) stop("shinyBS is required")
 
   # suppress warning messages from creating temporary directories when 3d plotting
   suppressWarnings(warning("dir.create(dir)"))

inst/shiny/ui.R

@@ -1,6 +1,8 @@
 ## CHECKS ##
 if(!require("shiny")) stop("shiny is required")
 if(!require("RLumShiny")) stop("RLumShiny is required")
+if(!require("shinyBS")) stop("shinyBS is required")
+if(!require("shinyRGL")) stop("shinyRGL is required")
 
 ## DEFINE UI ##
 shinyUI(