Skip to content

Commit

Permalink
基本JavaバージョンをJDK 1.8にする
Browse files Browse the repository at this point in the history
別バージョンの指定等は.bash_localに移行
  • Loading branch information
umi-uyura committed Jun 10, 2016
1 parent c58cfa7 commit 5df803c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions dots/local/.bash_local
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export ANDROID_NDK_HOME=$HOME/Library/android-ndk-r10b
export PATH=$ANDROID_NDK_HOME:$PATH


# Android Studio
# export STUDIO_JDK=$(/usr/libexec/java_home -v 1.7 | sed -e "s/\/Contents\/Home//")


#
# Postgress.app - http://postgresapp.com/
#
Expand Down
6 changes: 3 additions & 3 deletions shell/exports
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ export ALTERNATE_EDITOR='/Applications/Emacs.app/Contents/MacOS/Emacs'
#

# export ANDROID_JAVA_HOME=$JAVA_HOME
export ANDROID_JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
export ANDROID_HOME=$HOME/Library/android-sdk-macosx
export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
# export ANDROID_JAVA_HOME=$(/usr/libexec/java_home -v 1.7) # -> .bash_local

# Android Studio
export STUDIO_JDK=$(/usr/libexec/java_home -v 1.7 | sed -e "s/\/Contents\/Home//")
# Android Studio -> .bash_local
# export STUDIO_JDK=$(/usr/libexec/java_home -v 1.7 | sed -e "s/\/Contents\/Home//")


#
Expand Down

0 comments on commit 5df803c

Please sign in to comment.