Skip to content

Commit 81d5cf7

Browse files
committed
reorganized project into Android Studio-standard structure
1 parent 287e75d commit 81d5cf7

File tree

21 files changed

+45
-368
lines changed

21 files changed

+45
-368
lines changed

.classpath

Lines changed: 0 additions & 10 deletions
This file was deleted.

.project

Lines changed: 0 additions & 33 deletions
This file was deleted.

README.markdown

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ repositories {
4444
}
4545
4646
dependencies {
47-
compile 'com.commonsware.cwac:merge:1.1.+'
47+
compile 'com.commonsware.cwac:merge:1.1.2'
4848
}
4949
```
5050

@@ -152,6 +152,11 @@ please post an [issue](https://github.com/commonsguy/cwac-merge/issues),
152152
with enough information to reproduce the use case and therefore confirm that
153153
a modified `MergeAdapter` does what it is supposed to.
154154

155+
### JavaDocs
156+
157+
[JavaDocs are available](http://javadocs.commonsware.com/cwac/merge/index.html)
158+
for your JavaDocing pleasure.
159+
155160
Dependencies
156161
------------
157162
This project requires the [CWAC SackOfViewsAdapter][sacklist].
@@ -166,7 +171,7 @@ that do not work on API Level 4 and are not noted as requiring a higher version.
166171

167172
Version
168173
-------
169-
This is version v1.1.1 of this module.
174+
This is version v1.1.2 of this module.
170175

171176
For those of you updating from a previous version, please note that you need
172177
a new edition of the `SackOfViewsAdapter` JAR as well.
@@ -189,7 +194,7 @@ file.
189194
Questions
190195
---------
191196
If you have questions regarding the use of this code, please post a question
192-
on [StackOverflow](http://stackoverflow.com/questions/ask) tagged with
197+
on [Stack Overflow](http://stackoverflow.com/questions/ask) tagged with
193198
`commonsware-cwac` and `android` after [searching to see if there already is an answer](https://stackoverflow.com/search?q=[android]+mergeadapter). Be sure to indicate
194199
what CWAC module you are having issues with, and be sure to include source code
195200
and stack traces if you are encountering crashes.
@@ -200,10 +205,16 @@ The [contribution guidelines](CONTRIBUTING.md)
200205
provide some suggestions for how to create a bug report that will get
201206
the problem fixed the fastest.
202207

203-
Do not ask for help via Twitter.
208+
You are also welcome to join
209+
[the CommonsWare Community](https://community.commonsware.com/)
210+
and post questions
211+
and ideas to [the CWAC category](https://community.commonsware.com/c/cwac).
212+
213+
Do not ask for help via social media.
204214

205215
Release Notes
206216
-------------
217+
- v1.1.2: reorganized project into Android Studio-standard structure
207218
- v1.1.1: updated for Android Studio 1.0 and new AAR publishing system
208219
- v1.1.0: added `android:minSdkVersion` to library manifest
209220
- v1.0.4: added `cwac-` prefix to JAR

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.0.0'
8+
classpath 'com.android.tools.build:gradle:2.2.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

demo/.classpath

Lines changed: 0 additions & 9 deletions
This file was deleted.

demo/.project

Lines changed: 0 additions & 33 deletions
This file was deleted.

demo/ant.properties

Lines changed: 0 additions & 17 deletions
This file was deleted.

demo/build.gradle

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,10 @@ repositories {
88

99
dependencies {
1010
debugCompile project(':merge')
11-
releaseCompile 'com.commonsware.cwac:merge:1.1.+'
11+
releaseCompile 'com.commonsware.cwac:merge:1.1.2'
1212
}
1313

1414
android {
15-
compileSdkVersion 17
16-
buildToolsVersion "19.1.0"
17-
18-
sourceSets {
19-
main {
20-
manifest.srcFile 'AndroidManifest.xml'
21-
java.srcDirs = ['src']
22-
resources.srcDirs = ['src']
23-
aidl.srcDirs = ['src']
24-
renderscript.srcDirs = ['src']
25-
res.srcDirs = ['res']
26-
assets.srcDirs = ['assets']
27-
}
28-
29-
debug.setRoot('build-types/debug')
30-
release.setRoot('build-types/release')
31-
}
15+
compileSdkVersion 25
16+
buildToolsVersion "25.0.0"
3217
}

demo/build.xml

Lines changed: 0 additions & 85 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)