Skip to content

Commit

Permalink
Refactor versions into gradle.properties file
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanmoelter committed Apr 30, 2018
1 parent 8ae990f commit 9b5ae3e
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android:
components:
- tools
- platform-tools
- build-tools-27.0.2
- build-tools-27.0.3
- android-27
- extra

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
8 changes: 7 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ POM_DEVELOPER_ID=wealthfront
POM_DEVELOPER_NAME=Wealthfront, Inc.

RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/

BUILD_TOOLS_VERSION=27.0.3
SUPPORT_LIBRARY_VERSION=27.1.1
JUNIT_VERSION=4.12
TRUTH_VERSION=0.39
MOCKITO_VERSION=2.15.0
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 @@
#Fri Nov 03 19:06:10 PDT 2017
#Mon Apr 30 10:10:33 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
10 changes: 5 additions & 5 deletions magellan-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = VERSION_NAME

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion BUILD_TOOLS_VERSION

resourcePrefix 'magellan_'

Expand All @@ -30,11 +30,11 @@ apply from: rootProject.file('checkstyle/checkstyle.gradle')
dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:support-annotations:27.0.2'
implementation "com.android.support:support-annotations:${SUPPORT_LIBRARY_VERSION}"

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.39'
testImplementation 'org.mockito:mockito-core:2.15.0'
testImplementation "junit:junit:${JUNIT_VERSION}"
testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
testImplementation('org.robolectric:robolectric:3.7.1') {

exclude group: 'commons-logging', module: 'commons-logging'
Expand Down
8 changes: 4 additions & 4 deletions magellan-rx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = VERSION_NAME

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion 15
Expand All @@ -31,9 +31,9 @@ dependencies {
implementation project(':magellan-library')
implementation 'io.reactivex:rxjava:1.3.6'

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.39'
testImplementation 'org.mockito:mockito-core:2.15.0'
testImplementation "junit:junit:${JUNIT_VERSION}"
testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
8 changes: 4 additions & 4 deletions magellan-rx2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = VERSION_NAME

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion 15
Expand All @@ -31,9 +31,9 @@ dependencies {
implementation project(':magellan-library')
implementation 'io.reactivex.rxjava2:rxjava:2.1.10'

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.39'
testImplementation 'org.mockito:mockito-core:2.15.0'
testImplementation "junit:junit:${JUNIT_VERSION}"
testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
12 changes: 6 additions & 6 deletions magellan-sample-advanced/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion BUILD_TOOLS_VERSION
defaultConfig {
applicationId "com.wealthfront.magellan.sample"
minSdkVersion 15
Expand Down Expand Up @@ -30,14 +30,14 @@ apply from: rootProject.file('checkstyle/checkstyle.gradle')

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
implementation project(':magellan-library')

implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

implementation 'com.google.dagger:dagger:2.14.1'
annotationProcessor 'com.google.dagger:dagger-compiler:2.14.1'
implementation 'com.google.dagger:dagger:2.15'
annotationProcessor 'com.google.dagger:dagger-compiler:2.15'

implementation project(path: ':magellan-rx')

Expand All @@ -48,8 +48,8 @@ dependencies {

implementation 'io.reactivex:rxandroid:1.2.1'

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.15.0'
testImplementation "junit:junit:${JUNIT_VERSION}"
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
testImplementation 'org.robolectric:robolectric:3.7.1'

androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
Expand Down
6 changes: 3 additions & 3 deletions magellan-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion BUILD_TOOLS_VERSION
defaultConfig {
applicationId "com.wealthfront.magellan.sample"
minSdkVersion 15
Expand All @@ -22,11 +22,11 @@ apply from: rootProject.file('checkstyle/checkstyle.gradle')

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
implementation project(':magellan-library')
implementation project(':magellan-support')

testImplementation 'junit:junit:4.12'
testImplementation "junit:junit:${JUNIT_VERSION}"

androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
Expand Down
10 changes: 5 additions & 5 deletions magellan-support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = VERSION_NAME

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
buildToolsVersion BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion 15
Expand All @@ -29,11 +29,11 @@ dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':magellan-library')
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.39'
testImplementation 'org.mockito:mockito-core:2.15.0'
testImplementation "junit:junit:${JUNIT_VERSION}"
testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
testImplementation('org.robolectric:robolectric:3.7.1') {
exclude group: 'commons-logging', module: 'commons-logging'
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
Expand Down

0 comments on commit 9b5ae3e

Please sign in to comment.