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

Update deps and stuff #115

Merged
merged 14 commits into from
Sep 27, 2017
Merged

Update deps and stuff #115

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
25ba1b8
Update:
StefMa Sep 26, 2017
fa247fe
Document and extract compositeAndroidVersion
StefMa Sep 26, 2017
6ec6c5e
Update assertJ and mockito version
StefMa Sep 26, 2017
ee73942
Extract atsl- & espresso version
StefMa Sep 26, 2017
e685a08
Replace whole appCompat with annotations dep
StefMa Sep 26, 2017
d499998
Update atsl- and espresso version
StefMa Sep 26, 2017
91ad7dd
Update rxjava(1) dependencies
StefMa Sep 26, 2017
70e19ec
Update rxjava(2)
StefMa Sep 26, 2017
bbe0ee6
Clean workspace before build/test. Because cleaning is always a good …
StefMa Sep 26, 2017
df27816
Add travis comment to sdk version
StefMa Sep 27, 2017
a2839a1
Rename atsl to supportTest
StefMa Sep 27, 2017
47c4308
Update travis to API 26
StefMa Sep 27, 2017
5381b66
Revert "Clean workspace before build/test. Because cleaning is always…
StefMa Sep 27, 2017
710f7a5
Add travis comment to build tools
StefMa Sep 27, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ before_script:
- adb shell input keyevent 82 &

script:
- ./gradlew build jacocoTestReport assembleAndroidTest connectedCheck
- ./gradlew clean build jacocoTestReport assembleAndroidTest connectedCheck
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why clean? It will delete all build artifacts from the before_script assemble step


after_success:
- bash <(curl -s https://codecov.io/bash)
18 changes: 12 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
Expand All @@ -24,14 +25,19 @@ ext {
VERSION_NAME = "0.8.1-SNAPSHOT"
VERSION_CODE = 6
MIN_SDK_VERSION = 14
TARGET_SDK_VERSION = 25
COMPILE_SDK_VERSION = 25
BUILD_TOOLS_VERSION = '25.0.2'
TARGET_SDK_VERSION = 26
COMPILE_SDK_VERSION = 26
BUILD_TOOLS_VERSION = '26.0.1'

supportLibraryVersion = '25.2.0'
supportLibraryVersion = '26.0.0'
Copy link
Contributor

@passsy passsy Sep 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not 26.1.0. It includes LifecycleObserver which we could use for #109?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of #115 (comment) 🙃

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point!

// compositeAndroidVersion should be always the same version as the supportLib version
// Since composite is not up to date we can't use the latest one
compositeAndroidVersion = supportLibraryVersion
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good 👍


bintrayVersion = '0.5.0'
junitVersion = '4.12'
mockitoVersion = '1.10.19'
assertjVersion = '2.5.0'
mockitoVersion = '2.10.0'
assertjVersion = '2.8.0'
atslVersion = '1.0.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does atsl stand for?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

android test support library? I suggest supportTestVersion

espressoVersion = '3.0.1'
}
10 changes: 4 additions & 6 deletions plugin-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ android {
targetSdkVersion TARGET_SDK_VERSION
versionCode 1
versionName "1.0"

testInstrumentationRunner "net.grandcentrix.thirtyinch.plugin_test.TestRunner"

}
buildTypes {
release {
Expand All @@ -31,8 +29,8 @@ dependencies {
compile "com.pascalwelsch.compositeandroid:activity:$supportLibraryVersion"
compile "com.pascalwelsch.compositeandroid:fragment:$supportLibraryVersion"

androidTestCompile "com.android.support:appcompat-v7:$supportLibraryVersion"
androidTestCompile 'com.android.support.test:runner:0.5';
androidTestCompile 'com.android.support.test:rules:0.5';
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2';
androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion"
androidTestCompile "com.android.support.test:runner:$atslVersion";
androidTestCompile "com.android.support.test:rules:$atslVersion";
androidTestCompile "com.android.support.test.espresso:espresso-core:$espressoVersion";
}
4 changes: 2 additions & 2 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {

dependencies {
compile project(':thirtyinch')
provided "com.pascalwelsch.compositeandroid:activity:$supportLibraryVersion"
provided "com.pascalwelsch.compositeandroid:fragment:$supportLibraryVersion"
provided "com.pascalwelsch.compositeandroid:activity:$compositeAndroidVersion"
provided "com.pascalwelsch.compositeandroid:fragment:$compositeAndroidVersion"
}

publish {
Expand Down
4 changes: 2 additions & 2 deletions rx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {

dependencies {
compile project(':thirtyinch')
compile 'io.reactivex:rxjava:1.2.3'
compile 'com.artemzin.rxjava:proguard-rules:1.2.3.0'
compile 'io.reactivex:rxjava:1.3.2'
compile 'com.artemzin.rxjava:proguard-rules:1.2.7.0'
provided "com.android.support:support-annotations:$supportLibraryVersion"

testCompile "junit:junit:$junitVersion"
Expand Down
2 changes: 1 addition & 1 deletion rx2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {

dependencies {
compile project(':thirtyinch')
compile 'io.reactivex.rxjava2:rxjava:2.0.3'
compile 'io.reactivex.rxjava2:rxjava:2.1.4'
provided "com.android.support:support-annotations:$supportLibraryVersion"

testCompile "junit:junit:$junitVersion"
Expand Down
2 changes: 1 addition & 1 deletion thirtyinch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies {
testCompile "org.mockito:mockito-core:$mockitoVersion"
testCompile "org.assertj:assertj-core:$assertjVersion"

androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile "com.android.support.test:runner:$atslVersion"
androidTestCompile "org.mockito:mockito-core:$mockitoVersion"
}

Expand Down