Update version of gradle plugin (1.0.0-rc4)

johnkil · Dec 7, 2014 · 38f3325 · 38f3325
1 parent 4f138bb
commit 38f3325
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 143 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,21 +4,6 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc4'
     }
-}
-
-def isReleaseBuild() {
-    return version.contains("SNAPSHOT") == false
-}
-
-allprojects {
-    version = VERSION_NAME
-    group = GROUP
-
-    repositories {
-        mavenCentral()
-    }
-}
-
-apply plugin: 'android-reporting'
+}
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -1,11 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.devspark.appmsg"
-          android:versionCode="5"
-          android:versionName="1.2.0">
-
-    <uses-sdk
-            android:minSdkVersion="4"
-            android:targetSdkVersion="19"/>
+<manifest package="com.devspark.appmsg">
 
     <application/>
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,13 +1,16 @@
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         minSdkVersion 4
-        targetSdkVersion 19
+        targetSdkVersion 21
+        versionCode 5
+        versionName "1.2.0"
     }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -17,7 +20,5 @@ android {
     }
 }
 
-if (project.hasProperty('nexusUsername')) {
-    // Used to push in maven
-    apply from: '../maven_push.gradle'
-}
+// Used to push in maven
+apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/maven_push.gradle b/maven_push.gradle
diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
@@ -1,19 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.devspark.appmsg.sample"
-          android:versionCode="5"
-          android:versionName="1.2.0">
-
-    <uses-sdk
-            android:minSdkVersion="7"
-            android:targetSdkVersion="19"/>
+          package="com.devspark.appmsg.sample">
 
     <application
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
         <activity
-                android:name=".MainActivity"
-                android:windowSoftInputMode="stateUnchanged">
+            android:name=".MainActivity"
+            android:windowSoftInputMode="stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,17 +1,14 @@
-apply plugin: 'android'
-
-dependencies {
-    compile project(':library')
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-}
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
+        versionCode 5
+        versionName "1.2.0"
     }
 
     sourceSets {
@@ -22,3 +19,8 @@ android {
         }
     }
 }
+
+dependencies {
+    compile project(':library')
+    compile 'com.android.support:appcompat-v7:21.0.2'
+}
diff --git a/sample/src/com/devspark/appmsg/sample/MainActivity.java b/sample/src/com/devspark/appmsg/sample/MainActivity.java
@@ -19,14 +19,14 @@
 import android.animation.LayoutTransition;
 import android.annotation.TargetApi;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.actionbarsherlock.app.SherlockActivity;
 import com.devspark.appmsg.AppMsg;
 
 import static android.os.Build.VERSION.SDK_INT;
@@ -41,11 +41,10 @@
 
 /**
  * Sample of AppMsg library.
- * 
+ *
  * @author Evgeny Shishkin
- * 
  */
-public class MainActivity extends SherlockActivity {
+public class MainActivity extends ActionBarActivity {
     private static final int NORMAL_POSITION = 1;
     private static final int INFO_POSITION = 2;
 
@@ -92,7 +91,7 @@ private void enableChangingTransition() {
 
     /**
      * Button onClick listener.
-     * 
+     *
      * @param v
      */
     public void buttonClick(View v) {
@@ -115,8 +114,8 @@ private void showAppMsg() {
         final CharSequence providedMsg = mProvidedMsg.getText();
         final CharSequence msg = isEmpty(providedMsg)
                 ? new StringBuilder().append(mStyle.getSelectedItem())
-                    .append(" ").append(mPriority.getSelectedItem())
-                    .append(" msg#").append(mMsgCount).toString()
+                .append(" ").append(mPriority.getSelectedItem())
+                .append(" msg#").append(mMsgCount).toString()
                 : providedMsg;
         final AppMsg.Style style;
         boolean customAnimations = false;