Skip to content

Commit

Permalink
update to gradle 3 and build tools 26 after studio update
Browse files Browse the repository at this point in the history
  • Loading branch information
lz1asl committed Jan 4, 2018
1 parent 8795ccb commit 7a3d68d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 7 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ buildscript {
repositories {
mavenCentral()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:3.0.1'
}
}

Expand All @@ -27,7 +28,7 @@ dependencies {

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion '26.0.2'

defaultConfig {
minSdkVersion 7
Expand Down Expand Up @@ -56,6 +57,9 @@ android {
signingConfig signingConfigs.release
}
}

flavorDimensions "defaultFlavor"

productFlavors {
defaultFlavor {
proguardFile 'proguard-rules.txt'
Expand Down Expand Up @@ -83,3 +87,4 @@ android {
abortOnError false
}
}

10 changes: 3 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ case "`uname`" in
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
Expand All @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

Expand Down Expand Up @@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down

0 comments on commit 7a3d68d

Please sign in to comment.