Skip to content
This repository has been archived by the owner on Mar 17, 2022. It is now read-only.

Updated version of SDK, build tools and support libraries #231

Merged
merged 1 commit into from
Dec 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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()
}
}
10 changes: 5 additions & 5 deletions eyes-two/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -59,6 +59,6 @@ android {
}

dependencies {
compile project(':tess-two');
compile project(':tess-two')
compile fileTree(dir: 'libs', include: ['*.jar'])
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
11 changes: 5 additions & 6 deletions tess-two-test/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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'
}
}
8 changes: 4 additions & 4 deletions tess-two/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -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"
}


Expand Down