Skip to content

Commit

Permalink
Merge pull request #744 from elucideye/pr.android.plugins
Browse files Browse the repository at this point in the history
Update Android plugins
  • Loading branch information
ruslo authored Jan 31, 2019
2 parents c88f059 + bd43c90 commit 7001ac0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion android-studio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
2 changes: 1 addition & 1 deletion android-studio/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
2 changes: 1 addition & 1 deletion bin/detail/android_studio_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def android_studio_build():

# https://stackoverflow.com/a/38381577
f = open(os.path.join(licenses_dir, 'android-sdk-license'), 'w')
f.write('\nd56f5187479451eabf01fb78af6dfcb131a6481e')
f.write('\n24333f8a63b6825ea9c5514f83c2829b004d1fee')
f.close()

# https://stackoverflow.com/a/38339046
Expand Down
2 changes: 1 addition & 1 deletion bin/jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ case "${TYPE}" in

# https://stackoverflow.com/a/38381577
mkdir -p ${HOME}/android-sdk/licenses
echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "${HOME}/android-sdk/licenses/android-sdk-license"
echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "${HOME}/android-sdk/licenses/android-sdk-license"

# https://stackoverflow.com/a/38339046
echo "android.builder.sdkDownload=true" > gradle.properties
Expand Down

0 comments on commit 7001ac0

Please sign in to comment.