diff --git a/build.gradle b/build.gradle index 9665319fa..a7cff2807 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,15 @@ buildscript { repositories { + + maven { + url 'https://maven.google.com' + } + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } @@ -16,7 +21,18 @@ allprojects { group = 'com.rmtheis' version = '8.0.0' + project.ext { + compileSdkVersion=27 + buildToolsVersion='27.0.2' + androidSupportVersion='27.0.2' + } + repositories { + + maven { + url 'https://maven.google.com' + } + jcenter() } } diff --git a/eyes-two/build.gradle b/eyes-two/build.gradle index 2dc45ff77..0bd43fdcc 100644 --- a/eyes-two/build.gradle +++ b/eyes-two/build.gradle @@ -6,14 +6,14 @@ Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) android { - compileSdkVersion 23 - buildToolsVersion '25.0.0' + compileSdkVersion project.ext.compileSdkVersion + buildToolsVersion project.ext.buildToolsVersion defaultConfig { minSdkVersion 9 - targetSdkVersion 9 + targetSdkVersion 22 versionCode 1 - versionName "1.0" + versionName '1.0' } sourceSets { @@ -59,6 +59,6 @@ android { } dependencies { - compile project(':tess-two'); + compile project(':tess-two') compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f85a41816..442fdc5fa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Apr 02 14:22:01 PDT 2017 +#Fri Dec 15 09:15:44 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/tess-two-test/build.gradle b/tess-two-test/build.gradle index 49e45b13a..c76727250 100644 --- a/tess-two-test/build.gradle +++ b/tess-two-test/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion '25.0.0' + compileSdkVersion project.ext.compileSdkVersion + buildToolsVersion project.ext.buildToolsVersion defaultConfig { minSdkVersion 9 targetSdkVersion 22 versionCode 1 - versionName "1.0" + versionName '1.0' } sourceSets { @@ -28,7 +28,6 @@ android { } dependencies { - compile project(':tess-two'); - compile fileTree(dir: 'libs', include: ['*.jar']) + compile project(':tess-two') testCompile 'junit:junit:4.12' -} +} \ No newline at end of file diff --git a/tess-two/build.gradle b/tess-two/build.gradle index bcbb63f23..0e89158a7 100644 --- a/tess-two/build.gradle +++ b/tess-two/build.gradle @@ -8,14 +8,14 @@ Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) android { - compileSdkVersion 23 - buildToolsVersion '25.0.3' + compileSdkVersion project.ext.compileSdkVersion + buildToolsVersion project.ext.buildToolsVersion defaultConfig { minSdkVersion 9 targetSdkVersion 22 versionCode 1 - versionName "1.0" + versionName '1.0' consumerProguardFiles 'proguard-rules.pro' } @@ -61,7 +61,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-annotations:25.3.1' + compile "com.android.support:support-annotations:$project.ext.androidSupportVersion" }