Skip to content

Commit b2ad32b

Browse files
committed
Merge branch 'release/1.1.1'
2 parents ceee53a + c0b6963 commit b2ad32b

15 files changed

Lines changed: 311 additions & 47 deletions

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ Change Log
22
==========
33

44

5+
Version 1.1.1 *(2013-10-29)*
6+
----------------------------
7+
8+
* Update gradle build
9+
10+
511
Version 1.1.0 *(2013-10-08)*
612
----------------------------
713

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Android AppMsg (Crouton) Library
2-
==============================
2+
================================
33

44
Implementation of in-layout notifications. Based on [Toast](http://developer.android.com/reference/android/widget/Toast.html) notifications and article [The making of Prixing #4: in-layout notifications](http://android.cyrilmottier.com/?p=773) by [Cyril Mottier](http://www.cyrilmottier.com/).
55

@@ -73,7 +73,7 @@ Android-AppMsg Library is now pushed to Maven Central as a AAR, so you just need
7373

7474
``` xml
7575
dependencies {
76-
compile 'io.github.johnkil:android-appmsg:1.1'
76+
compile 'com.github.johnkil.android-appmsg:appmsg:1.1.1'
7777
}
7878
```
7979

build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
2+
repositories {
3+
mavenCentral()
4+
}
55

6-
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.5.+'
8-
}
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:0.6.+'
8+
}
99
}
1010

1111
def isReleaseBuild() {
@@ -21,5 +21,4 @@ allprojects {
2121
}
2222
}
2323

24-
apply plugin: 'android-reporting'
25-
24+
apply plugin: 'android-reporting'

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
VERSION_NAME=1.1-SNAPSHOT
2-
VERSION_CODE=3
3-
GROUP=io.github.johnkil
1+
VERSION_NAME=1.1.1-SNAPSHOT
2+
VERSION_CODE=4
3+
GROUP=com.github.johnkil.android-appmsg
44

55
POM_DESCRIPTION=In-layout android notifications
6-
POM_URL=http://johnkil.github.io/Android-AppMsg
6+
POM_URL=https://github.com/johnkil/Android-AppMsg
77
POM_SCM_URL=https://github.com/johnkil/Android-AppMsg
88
POM_SCM_CONNECTION=scm:git@github.com:johnkil/Android-AppMsg.git
99
POM_SCM_DEV_CONNECTION=scm:git@github.com:johnkil/Android-AppMsg.git

gradle/wrapper/gradle-wrapper.jar

49.3 KB
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Fri Oct 25 13:11:37 MSK 2013
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip

gradlew

Lines changed: 164 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/AndroidManifest.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.devspark.appmsg"
3-
android:versionCode="3"
4-
android:versionName="1.1" >
2+
package="com.devspark.appmsg"
3+
android:versionCode="4"
4+
android:versionName="1.1.1">
55

66
<uses-sdk
7-
android:minSdkVersion="4"
8-
android:targetSdkVersion="18" />
9-
10-
<application />
7+
android:minSdkVersion="4"
8+
android:targetSdkVersion="18"/>
9+
10+
<application/>
1111

1212
</manifest>

library/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
apply plugin: 'android-library'
22

33
android {
4-
compileSdkVersion 18
5-
buildToolsVersion '17.0.0'
4+
compileSdkVersion 18
5+
buildToolsVersion '18.1.0'
66

7-
sourceSets {
8-
main {
9-
manifest.srcFile 'AndroidManifest.xml'
10-
java.srcDirs = ['src']
11-
res.srcDirs = ['res']
7+
sourceSets {
8+
main {
9+
manifest.srcFile 'AndroidManifest.xml'
10+
java.srcDirs = ['src']
11+
res.srcDirs = ['res']
12+
}
1213
}
13-
}
1414
}
1515

1616
// Used to push in maven
17-
// apply from: '../maven_push.gradle'
17+
apply from: '../maven_push.gradle'

0 commit comments

Comments
 (0)