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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rolf-Smit committed Jan 25, 2018
2 parents 8f26f39 + e75aea8 commit a9d0335
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ Android-Retainable-Tasks is available on jcenter just like many other Android/Ja
```groovy
dependencies {
// Gradle < 3.0
compile 'org.neotech.library:android-retainable-tasks:1.0.0-rc-3'
compile 'org.neotech.library:android-retainable-tasks:1.0.0-rc-4'
// Gradle >= 3.0
implementation 'org.neotech.library:android-retainable-tasks:1.0.0-rc-3'
implementation 'org.neotech.library:android-retainable-tasks:1.0.0-rc-4'
// Needed if you want to use annotations (all Gradle versions)
annotationProcessor 'org.neotech.library:android-retainable-tasks-compiler:1.0.0-rc-3'
annotationProcessor 'org.neotech.library:android-retainable-tasks-compiler:1.0.0-rc-4'
}
```

Expand Down
3 changes: 2 additions & 1 deletion annotations-processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ version = VERSION_NAME

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':annotations')

implementation 'org.neotech.library:android-retainable-tasks-annotations:1.0.0-rc-4'

// Java Poet to create Java source files
implementation 'com.squareup:javapoet:1.9.0'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'

// Bintray
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'

// Maven for Android projects
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
4 changes: 2 additions & 2 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ dependencies {
implementation project(':library')
annotationProcessor project(":annotations-processor")

implementation 'com.android.support:appcompat-v7:27.0.1'
implementation 'com.android.support:design:27.0.1'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'

//LeakCanary is used to detect memory leaks in debug builds.
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# org.gradle.parallel=true

GROUP=org.neotech.library
VERSION_NAME=1.0.0-rc-3
VERSION_NAME=1.0.0-rc-4

BINTRAY_REPO=maven
BINTRAY_LICENCE=Apache-2.0
Expand Down
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ configurations {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

api project(':annotations')
implementation 'com.android.support:appcompat-v7:27.0.1'
javadoc 'com.android.support:appcompat-v7:27.0.1'
api 'org.neotech.library:android-retainable-tasks-annotations:1.0.0-rc-4'
implementation 'com.android.support:appcompat-v7:27.0.2'
javadoc 'com.android.support:appcompat-v7:27.0.2'

testImplementation 'junit:junit:4.12'
}
Expand Down

0 comments on commit a9d0335

Please sign in to comment.