Skip to content

Commit

Permalink
Updating Dependencies and README (#36)
Browse files Browse the repository at this point in the history
* Updating Dependencies and README

* Update Travis configuration
  • Loading branch information
jraska committed Jun 26, 2018
1 parent e17caab commit 70e374f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android:
- tools
- platform-tools
- tools
- build-tools-27.0.2
- build-tools-27.0.3
- android-27

- extra-google-m2repository
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public void awesomeTest() {
```
#### Gradle
```groovy
androidTestCompile 'com.jraska:falcon:2.0.1'
androidTestCompile 'com.jraska:falcon-spoon-compat:2.0.1'
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
Expand All @@ -26,7 +26,7 @@ ext {
minSdkVersion = 14
compileSdkVersion = 27
targetSdkVersion = compileSdkVersion
buildToolsVersion = '27.0.2'
buildToolsVersion = '27.0.3'
sourceCompatibility = JavaVersion.VERSION_1_7
}

Expand Down
12 changes: 6 additions & 6 deletions falcon-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ android {
dependencies {
implementation project(':falcon')

implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'


androidTestImplementation project(':falcon-spoon-compat')
//noinspection GradleDependency - 3 cannot be compiled due to JVM 8 instructions
androidTestImplementation 'org.assertj:assertj-core:2.9.0'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test:rules:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

// separately set because of test runners older dependencies
androidTestImplementation 'com.android.support:support-annotations:27.0.2'
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
}
2 changes: 1 addition & 1 deletion falcon-spoon-compat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android {
}

dependencies {
implementation 'com.android.support.test:rules:1.0.1'
implementation 'com.android.support.test:rules:1.0.2'
implementation project(':falcon')
api "com.squareup.spoon:spoon-client:2.0.0-SNAPSHOT"
api 'junit:junit:4.12'
Expand Down
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 @@
#Tue Dec 05 16:54:52 CET 2017
#Tue Jun 26 23:14:20 CEST 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

0 comments on commit 70e374f

Please sign in to comment.