Skip to content

Commit 16d4002

Browse files
committed
added Gradle files and published AAR
1 parent 20f4ee3 commit 16d4002

19 files changed

+235
-74
lines changed

.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="gen"/>
53
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
64
<classpathentry kind="lib" path="libs/CWAC-SackOfViewsAdapter.jar"/>
75
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
86
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
7+
<classpathentry kind="src" path="src"/>
8+
<classpathentry kind="src" path="gen"/>
99
<classpathentry kind="output" path="bin/classes"/>
1010
</classpath>

AndroidManifest.xml

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

README.markdown

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,40 @@ then attach your adapter to the `ListView`.
1414
There is also `MergeSpinnerAdapter` for use with `Spinner`
1515
widgets.
1616

17-
This is packaged as an Android library project, though
18-
[a simple JAR is also available](https://github.com/commonsguy/cwac-merge/releases).
17+
Installation
18+
------------
19+
This Android library project is
20+
[available as a JAR](https://gihub.com/commonsguy/cwac-merge/releases).
21+
If you wish to use the JAR, you will need to also add the JAR from
22+
[the CWAC-Sacklist project](http://github.com/commonsguy/cwac-sacklist) to your
23+
project
24+
25+
Also note that if you plan to use this as an Android library project
26+
in source form, you
27+
will also need to download [the CWAC-Sacklist project](http://github.com/commonsguy/cwac-sacklist)
28+
(and, if needed, modify this project's configuration to point to your copy of
29+
CWAC-Sacklist library project). Alternatively, download the CWAC-Sacklist JAR into
30+
the `libs/` directory of your clone of this project and remove the dependency on
31+
the CWAC-Sacklist library project.
32+
33+
This project is also available as
34+
an artifact for use with Gradle. To use that, add the following
35+
blocks to your `build.gradle` file:
36+
37+
```groovy
38+
repositories {
39+
maven {
40+
url "https://repo.commonsware.com.s3.amazonaws.com"
41+
}
42+
}
43+
44+
dependencies {
45+
compile 'com.commonsware.cwac:merge:1.0.1'
46+
}
47+
```
48+
49+
Or, if you cannot use SSL, use `http://repo.commonsware.com` for the repository
50+
URL. This should automatically pull down the CWAC-Sacklist dependency.
1951

2052
Usage
2153
-----
@@ -131,7 +163,7 @@ that do not work on API Level 4 and are not noted as requiring a higher version.
131163

132164
Version
133165
-------
134-
This is version v1.0.0 of this module.
166+
This is version v1.0.1 of this module.
135167

136168
For those of you updating from a previous version, please note that you need
137169
a new edition of the `SackOfViewsAdapter` JAR as well.
@@ -165,6 +197,7 @@ Do not ask for help via Twitter.
165197

166198
Release Notes
167199
-------------
200+
- v1.0.1: added Gradle files and published AAR
168201
- v1.0.0: milestone considered reached
169202
- v0.4.0: added `setActive()`
170203
- v0.3.1: added workaround for http://code.google.com/p/android/issues/detail?id=16155

ant.properties

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

demo/.classpath

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="gen"/>
53
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
64
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7-
<classpathentry kind="lib" path="/MergeAdapter/libs/CWAC-SackOfViewsAdapter.jar"/>
85
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
6+
<classpathentry kind="src" path="src"/>
7+
<classpathentry kind="src" path="gen"/>
98
<classpathentry kind="output" path="bin/classes"/>
109
</classpath>

demo/build.gradle

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
dependencies {
6+
classpath 'com.android.tools.build:gradle:0.7.+'
7+
}
8+
}
9+
10+
apply plugin: 'android'
11+
12+
repositories {
13+
maven {
14+
url "https://repo.commonsware.com.s3.amazonaws.com"
15+
}
16+
}
17+
18+
dependencies {
19+
compile 'com.commonsware.cwac:merge:1.0.1'
20+
}
21+
22+
android {
23+
compileSdkVersion 17
24+
buildToolsVersion "18.1.0"
25+
26+
sourceSets {
27+
main {
28+
manifest.srcFile 'AndroidManifest.xml'
29+
java.srcDirs = ['src']
30+
resources.srcDirs = ['src']
31+
aidl.srcDirs = ['src']
32+
renderscript.srcDirs = ['src']
33+
res.srcDirs = ['res']
34+
assets.srcDirs = ['assets']
35+
}
36+
37+
debug.setRoot('build-types/debug')
38+
release.setRoot('build-types/release')
39+
}
40+
}

demo/proguard-project.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# To enable ProGuard in your project, edit project.properties
2+
# to define the proguard.config property as described in that file.
3+
#
4+
# Add project specific ProGuard rules here.
5+
# By default, the flags in this file are appended to flags specified
6+
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7+
# You can edit the include path and order by changing the ProGuard
8+
# include property in project.properties.
9+
#
10+
# For more details, see
11+
# http://developer.android.com/guide/developing/tools/proguard.html
12+
13+
# Add any project specific keep options here:
14+
15+
# If your project uses WebView with JS, uncomment the following
16+
# and specify the fully qualified class name to the JavaScript interface
17+
# class:
18+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
19+
# public *;
20+
#}

demo/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
# Project target.
1111
target=android-4
12-
android.library.reference.1=..
12+
android.library.reference.1=../merge

libs/CWAC-SackOfViewsAdapter.jar

-2.63 KB
Binary file not shown.

merge/.classpath

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="gen"/>
5+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
8+
<classpathentry kind="output" path="bin/classes"/>
9+
</classpath>

0 commit comments

Comments
 (0)