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

Commit a9d0335

Browse files
committed
Merge branch 'develop'
2 parents 8f26f39 + e75aea8 commit a9d0335

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ Android-Retainable-Tasks is available on jcenter just like many other Android/Ja
5353
```groovy
5454
dependencies {
5555
// Gradle < 3.0
56-
compile 'org.neotech.library:android-retainable-tasks:1.0.0-rc-3'
56+
compile 'org.neotech.library:android-retainable-tasks:1.0.0-rc-4'
5757
5858
// Gradle >= 3.0
59-
implementation 'org.neotech.library:android-retainable-tasks:1.0.0-rc-3'
59+
implementation 'org.neotech.library:android-retainable-tasks:1.0.0-rc-4'
6060
6161
// Needed if you want to use annotations (all Gradle versions)
62-
annotationProcessor 'org.neotech.library:android-retainable-tasks-compiler:1.0.0-rc-3'
62+
annotationProcessor 'org.neotech.library:android-retainable-tasks-compiler:1.0.0-rc-4'
6363
}
6464
```
6565

annotations-processor/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ version = VERSION_NAME
1212

1313
dependencies {
1414
implementation fileTree(include: ['*.jar'], dir: 'libs')
15-
implementation project(':annotations')
15+
16+
implementation 'org.neotech.library:android-retainable-tasks-annotations:1.0.0-rc-4'
1617

1718
// Java Poet to create Java source files
1819
implementation 'com.squareup:javapoet:1.9.0'

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.0'
9+
classpath 'com.android.tools.build:gradle:3.0.1'
1010

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

1414
// Maven for Android projects
15-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
15+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files
1818
}

demo/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ dependencies {
2323
implementation project(':library')
2424
annotationProcessor project(":annotations-processor")
2525

26-
implementation 'com.android.support:appcompat-v7:27.0.1'
27-
implementation 'com.android.support:design:27.0.1'
26+
implementation 'com.android.support:appcompat-v7:27.0.2'
27+
implementation 'com.android.support:design:27.0.2'
2828

2929
//LeakCanary is used to detect memory leaks in debug builds.
3030
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# org.gradle.parallel=true
1919

2020
GROUP=org.neotech.library
21-
VERSION_NAME=1.0.0-rc-3
21+
VERSION_NAME=1.0.0-rc-4
2222

2323
BINTRAY_REPO=maven
2424
BINTRAY_LICENCE=Apache-2.0

library/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ configurations {
3636
dependencies {
3737
implementation fileTree(include: ['*.jar'], dir: 'libs')
3838

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

4343
testImplementation 'junit:junit:4.12'
4444
}

0 commit comments

Comments
 (0)