Prepare for 4.4.0.

JakeWharton · Jul 28, 2013 · e2a538e · e2a538e
1 parent 12fcd68
commit e2a538e
Show file tree

Hide file tree

Showing 29 changed files with 138 additions and 131 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Change Log
 ===============================================================================
 
+Version 4.4.0 *(2013-07-28)*
+----------------------------
+
+ * Add Gradle support.
+ * Fix: Use 'sw' and 'w' qualifiers on ICS+ only to prevent OEM resource bugs.
+ * Fix: Improve handling of popup windows to prevent leaks.
+ * Fix: Support turning off textAllCaps style attribute on action items.
+ * Fix: Potential logging NullPointerException when a MenuItem title was omitted.
+
+
 Version 4.3.1 *(2013-04-28)*
 ----------------------------
 

diff --git a/actionbarsherlock-fest/AndroidManifest.xml b/actionbarsherlock-fest/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.fest">
+  <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
+  <application/>
+</manifest>
diff --git a/actionbarsherlock-fest/build.gradle b/actionbarsherlock-fest/build.gradle
@@ -1,7 +1,20 @@
-apply plugin: 'java'
+apply plugin: 'android-library'
 
 dependencies {
-  compile 'com.squareup:fest-android:1.0.4'
+  compile 'com.squareup:fest-android:1.0.5'
 
-  runtime project(':actionbarsherlock')
+  compile project(':actionbarsherlock')
+}
+
+android {
+  compileSdkVersion 14
+  buildToolsVersion '17.0.0'
+
+  sourceSets {
+    main {
+      manifest.srcFile 'AndroidManifest.xml'
+      java.srcDirs = ['src']
+      res.srcDirs = ['res']
+    }
+  }
 }
diff --git a/actionbarsherlock-fest/pom.xml b/actionbarsherlock-fest/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -35,4 +35,29 @@
       <artifactId>fest-android</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <type>aar</type>
+                  <file>${project.basedir}/build//libs/${project.artifactId}-${gradle.version}.aar</file>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/actionbarsherlock-i18n/AndroidManifest.xml b/actionbarsherlock-i18n/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock.i18n">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.i18n">
   <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
   <application/>
 </manifest>
diff --git a/actionbarsherlock-i18n/build.gradle b/actionbarsherlock-i18n/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 android {
   compileSdkVersion 14
-  buildToolsVersion '17'
+  buildToolsVersion '17.0.0'
 
   sourceSets {
     main {

diff --git a/actionbarsherlock-i18n/pom.xml b/actionbarsherlock-i18n/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -53,6 +53,27 @@
           </inputFiles>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <type>aar</type>
+                  <file>${project.basedir}/build/libs/${project.artifactId}-${gradle.version}.aar</file>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/actionbarsherlock-samples/demos/AndroidManifest.xml b/actionbarsherlock-samples/demos/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.sample.demos">
 
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
 

diff --git a/actionbarsherlock-samples/demos/build.gradle b/actionbarsherlock-samples/demos/build.gradle
diff --git a/actionbarsherlock-samples/demos/pom.xml b/actionbarsherlock-samples/demos/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent-sample</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/actionbarsherlock-samples/fragments/AndroidManifest.xml b/actionbarsherlock-samples/fragments/AndroidManifest.xml
@@ -16,7 +16,7 @@
      attribute brings in the Android platform namespace, and the package
      supplies a unique name for the application.  When writing your
      own application, the package name must be changed from "com.example.*"
-     to come from a domain that you own or have control over. --><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.fragments">
+     to come from a domain that you own or have control over. --><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.sample.fragments">
 
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
 

diff --git a/actionbarsherlock-samples/fragments/build.gradle b/actionbarsherlock-samples/fragments/build.gradle
diff --git a/actionbarsherlock-samples/fragments/pom.xml b/actionbarsherlock-samples/fragments/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent-sample</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/actionbarsherlock-samples/known-bugs/AndroidManifest.xml b/actionbarsherlock-samples/known-bugs/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.knownbugs">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.sample.knownbugs">
 
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
 

diff --git a/actionbarsherlock-samples/known-bugs/build.gradle b/actionbarsherlock-samples/known-bugs/build.gradle
diff --git a/actionbarsherlock-samples/known-bugs/pom.xml b/actionbarsherlock-samples/known-bugs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent-sample</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/actionbarsherlock-samples/pom.xml b/actionbarsherlock-samples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/actionbarsherlock-samples/roboguice/AndroidManifest.xml b/actionbarsherlock-samples/roboguice/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.roboguice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.sample.roboguice">
 
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
 

diff --git a/actionbarsherlock-samples/roboguice/build.gradle b/actionbarsherlock-samples/roboguice/build.gradle
diff --git a/actionbarsherlock-samples/roboguice/pom.xml b/actionbarsherlock-samples/roboguice/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent-sample</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/actionbarsherlock-samples/styled/AndroidManifest.xml b/actionbarsherlock-samples/styled/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.styled">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock.sample.styled">
 
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
 

diff --git a/actionbarsherlock-samples/styled/build.gradle b/actionbarsherlock-samples/styled/build.gradle
diff --git a/actionbarsherlock-samples/styled/pom.xml b/actionbarsherlock-samples/styled/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent-sample</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/actionbarsherlock/AndroidManifest.xml b/actionbarsherlock/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440" android:versionName="4.4.0" package="com.actionbarsherlock">
   <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
+  <application/>
 </manifest>
diff --git a/actionbarsherlock/build.gradle b/actionbarsherlock/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'android-library'
 
 dependencies {
-  compile 'com.google.android:support-v4:r7'
+  compile 'com.android.support:support-v4:18.0.+'
 }
 
 android {
   compileSdkVersion 14
-  buildToolsVersion '17'
+  buildToolsVersion '17.0.0'
 
   sourceSets {
     main {

diff --git a/actionbarsherlock/pom.xml b/actionbarsherlock/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.actionbarsherlock</groupId>
     <artifactId>parent</artifactId>
-    <version>4.3.2-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -97,6 +97,10 @@
                   <type>jar</type>
                   <file>${project.build.directory}/${project.build.finalName}.jar</file>
                 </artifact>
+                <artifact>
+                  <type>aar</type>
+                  <file>${project.basedir}/build/libs/${project.artifactId}-${gradle.version}.aar</file>
+                </artifact>
               </artifacts>
             </configuration>
           </execution>

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
 allprojects {
   group = 'com.actionbarsherlock'
-  version = '4.3.2-SNAPSHOT'
+  version = '4.4.0'
 
   repositories {
     mavenCentral()
@@ -20,5 +20,3 @@ allprojects {
     options.encoding = "UTF-8"
   }
 }
-
-apply plugin: 'android-reporting'