updated all scripts to use R 3.1.0 as the default version

bin/compile

@@ -32,8 +32,8 @@ LP_DIR=`cd $(dirname $0); cd ..; pwd`
 BUILDPACK_DIR="$(dirname $(dirname $0))"
 
 # config
-R_VERSION="3.0.2"
-BUILD_PACK_VERSION="20140218-0019"
+R_VERSION="3.1.0"
+BUILD_PACK_VERSION="20140608-1824"
 
 S3_BUCKET="heroku-buildpack-r"
 R_BINARIES="http://${S3_BUCKET}.s3.amazonaws.com/R-${R_VERSION}-binaries-${BUILD_PACK_VERSION}.tar.gz"

support/Vagrantfile

@@ -1,6 +1,8 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+DEFAULT_R_VERSION = "3.1.0"
+
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
@@ -15,7 +17,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     shell.privileged = false
 
     # pass the R version and Build No along...
-    shell.args = "#{ENV['R_VERSION'] || '2.15.1'} #{ENV['BUILD_NO'] || Time.now.strftime('%Y%m%d-%H%M')}"
+    shell.args = "#{ENV['R_VERSION'] || DEFAULT_R_VERSION} #{ENV['BUILD_NO'] || Time.now.strftime('%Y%m%d-%H%M')}"
   end
 
 end

support/build-r

@@ -41,7 +41,7 @@ function build() {
 
 ## SCRIPT
 
-r_version="${1:-2.15.1}"
+r_version="${1:-3.1.0}"
 r_version_major=${r_version:0:1}
 build_no="${2:-`date +%Y%m%d-%H%M`}"
 
@@ -50,8 +50,8 @@ if ([ -z "$r_version" ] || [ -z "$build_no" ]); then
   echo
   echo "USAGE: $0 VERSION [BUILDNUM]"
   echo
-  echo "  VERSION    is the R version. E.g. 2.15.1"
-  echo "  BUILDNUM   the build number. E.g. 20131031-1400"
+  echo "  VERSION    is the R version. E.g. 3.1.0"
+  echo "  BUILDNUM   the build number. E.g. 20140608-2010"
   echo
   exit 1
 fi

support/build_with_heroku

@@ -16,7 +16,7 @@ if [[ ! -f .env ]]; then
   exit 1
 fi
 
-r_version="${1:-2.15.1}"
+r_version="${1:-3.1.0}"
 build_no="${2:-`date +%Y%m%d-%H%M`}"
 
 rm -rf .git &> /dev/null

support/build_with_vagrant

@@ -16,7 +16,7 @@ if [[ ! -f .env ]]; then
   exit 1
 fi
 
-r_version="${1:-2.15.1}"
+r_version="${1:-3.1.0}"
 build_no="${2:-`date +%Y%m%d-%H%M`}"
 
 # provision vagrant instance & build R binaries

support/build_with_vulcan

@@ -16,7 +16,7 @@ if [[ ! -f .env ]]; then
   exit 1
 fi
 
-r_version="${1:-2.15.1}"
+r_version="${1:-3.1.0}"
 build_no="${2:-`date +%Y%m%d-%H%M`}"
 
 vulcan create heroku-buildpack-r

support/fetch-binary

@@ -5,7 +5,7 @@
 build_uuid=$1
 cloudant_uid=${2:-$CLOUDANT_UID}
 cloudant_pwd=${3:-$CLOUDANT_PWD}
-rversion=${4:-2.15.1}
+rversion=${4:-3.1.0}
 
 if [ -z "$build_uuid" ] || [ -z "$cloudant_uid" ] || [ -z "$cloudant_pwd" ] || [ -z "$rversion" ]; then
 

support/vagrant-build

@@ -8,7 +8,7 @@ set -e
 # debug
 # set -x
 
-r_version="${1:-2.15.1}"
+r_version="${1:-3.1.0}"
 build_no="${2:-`date +%Y%m%d-%H%M`}"
 
 # create output directory