1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-03 08:35:29 +02:00

Merge branch 'fixing_android_build'

This commit is contained in:
Laurent Cozic 2018-10-14 23:56:42 +01:00
commit 590c62c371
2 changed files with 3 additions and 4 deletions

View File

@ -6,14 +6,14 @@ buildscript {
minSdkVersion = 16 minSdkVersion = 16
compileSdkVersion = 27 compileSdkVersion = 27
targetSdkVersion = 26 targetSdkVersion = 26
supportLibVersion = "26.1.0" supportLibVersion = "27.1.1"
} }
repositories { repositories {
jcenter() jcenter()
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.1.4'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -1,6 +1,5 @@
#Sat Oct 13 00:16:49 BST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip