Merge branch 'release/1.1'

.gitignore

@@ -1,40 +1,36 @@
-# built application files
-*.apk
-*.ap_
+#Android generated
+bin
+gen
 
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-.gradle/
-**/build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-library/.classpath
-library/.project
-sample/.classpath
-sample/.project
+#Eclipse
+.project
+.classpath
+.settings
 
 #IntelliJ IDEA
 .idea
 *.iml
 *.ipr
 *.iws
-classes
-gen-external-apklibs
-atlassian-ide-plugin.xml
+out
 
 #Maven
 target
 release.properties
 pom.xml.*
 
-#Others
-.directory
+#Ant
+build.xml
+local.properties
+proguard.cfg
+proguard-project.txt
+
+#Gradle
+.gradle
+build
+
+#OSX
+.DS_Store
+
+#Personal Files
+signing.properties

CHANGELOG.md

@@ -2,14 +2,22 @@ Change Log
 ==========
 
 
+Version 1.1.0 *(2013-10-08)*
+----------------------------
+
+ * Publish an aar file to Maven Central with Gradle.
+ * Fix: Add missing piece to the build.gradle.
+ * Fix: Updated the version of android-maven-plugin to build with the most recent Android SDK.
+
+
 Version 1.0.1 *(2013-01-07)*
 ----------------------------
 
- * Formatting of the source code
- * Bugfix
+ * Formatting of the source code.
+ * Bugfix.
 
 
 Version 1.0.0 *(2012-12-23)*
---------------------------
+----------------------------
 
 Initial release.

README.md

@@ -66,6 +66,17 @@ To display the item you need the following code:
 AppMsg.makeText(/*Activity*/, /*CharSequence*/, /*AppMsg.Style*/).show();
 ```
 
+Gradle
+------
+
+Android-AppMsg Library is now pushed to Maven Central as a AAR, so you just need to add the following dependency to your build.gradle.
+
+``` xml
+dependencies {
+	compile 'io.github.johnkil:android-appmsg:1.1'
+}
+```
+
 Contribution
 ------------
 

build.gradle

@@ -4,7 +4,22 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.4'
+    classpath 'com.android.tools.build:gradle:0.5.+'
   }
 }
 
+def isReleaseBuild() {
+    return version.contains("SNAPSHOT") == false
+}
+
+allprojects {
+    version = VERSION_NAME
+    group = GROUP
+
+    repositories {
+        mavenCentral()
+    }
+}
+
+apply plugin: 'android-reporting'
+

gradle.properties

@@ -0,0 +1,14 @@
+VERSION_NAME=1.1-SNAPSHOT
+VERSION_CODE=3
+GROUP=io.github.johnkil
+
+POM_DESCRIPTION=In-layout android notifications
+POM_URL=http://johnkil.github.io/Android-AppMsg
+POM_SCM_URL=https://github.com/johnkil/Android-AppMsg
+POM_SCM_CONNECTION=scm:[email protected]:johnkil/Android-AppMsg.git
+POM_SCM_DEV_CONNECTION=scm:[email protected]:johnkil/Android-AppMsg.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=johnkil
+POM_DEVELOPER_NAME=Evgeny Shishkin

library/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.devspark.appmsg"
-    android:versionCode="2"
-    android:versionName="1.0.1" >
+    android:versionCode="3"
+    android:versionName="1.1" >
 
     <uses-sdk
         android:minSdkVersion="4"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="18" />
+
+    <application />
 
 </manifest>

library/build.gradle

@@ -1,18 +1,8 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-
 apply plugin: 'android-library'
 
 android {
-  compileSdkVersion 17
-  buildToolsVersion '17'
+  compileSdkVersion 18
+  buildToolsVersion '17.0.0'
 
   sourceSets {
     main {
@@ -22,3 +12,6 @@ android {
     }
   }
 }
+
+// Used to push in maven
+// apply from: '../maven_push.gradle'

library/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=Android-AppMsg Library
+POM_ARTIFACT_ID=android-appmsg
+POM_PACKAGING=aar

library/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-18
 android.library=true

maven_push.gradle

@@ -0,0 +1,82 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def sonatypeRepositoryUrl
+if (isReleaseBuild()) {
+    println 'RELEASE BUILD'
+    sonatypeRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+} else {
+    println 'DEBUG BUILD'
+    sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+}
+
+afterEvaluate { project ->
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+                pom.artifactId = POM_ARTIFACT_ID
+
+                repository(url: sonatypeRepositoryUrl) {
+                    authentication(userName: nexusUsername, password: nexusPassword)
+                }
+
+                pom.project {
+                    name POM_NAME
+                    packaging POM_PACKAGING
+                    description POM_DESCRIPTION
+                    url POM_URL
+
+                    scm {
+                        url POM_SCM_URL
+                        connection POM_SCM_CONNECTION
+                        developerConnection POM_SCM_DEV_CONNECTION
+                    }
+
+                    licenses {
+                        license {
+                            name POM_LICENCE_NAME
+                            url POM_LICENCE_URL
+                            distribution POM_LICENCE_DIST
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id POM_DEVELOPER_ID
+                            name POM_DEVELOPER_NAME
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+        sign configurations.archives
+    }
+
+    task androidJavadocs(type: Javadoc) {
+        source = android.sourceSets.main.allJava
+    }
+
+    task androidJavadocsJar(type: Jar) {
+        classifier = 'javadoc'
+        //basename = artifact_id
+        from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        //basename = artifact_id
+        from android.sourceSets.main.allSource
+    }
+
+    artifacts {
+        //archives packageReleaseJar
+        archives androidSourcesJar
+        archives androidJavadocsJar
+    }
+}

sample/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.devspark.appmsg.sample"
-    android:versionCode="2"
-    android:versionName="1.0.1" >
+    android:versionCode="3"
+    android:versionName="1.1" >
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="18" />
 
     <application
         android:icon="@drawable/ic_launcher"

sample/build.gradle

@@ -6,18 +6,14 @@ dependencies {
 }
 
 android {
+    compileSdkVersion 18
     buildToolsVersion '17.0.0'
-    compileSdkVersion 17
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
         }
     }
 }

sample/project.properties

@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-18
 android.library.reference.1=../../ActionBarSherlock/library
 android.library.reference.2=../library