Permalink
Browse files

Prepare for 4.4.0.

  • Loading branch information...
1 parent 12fcd68 commit e2a538e0463c8776f4e8076116e367925dc90a9e @JakeWharton committed Jul 28, 2013
View
10 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)*
----------------------------
View
5 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>
View
19 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']
+ }
+ }
}
View
27 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>
View
2 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>
View
2 actionbarsherlock-i18n/build.gradle
@@ -6,7 +6,7 @@ dependencies {
android {
compileSdkVersion 14
- buildToolsVersion '17'
+ buildToolsVersion '17.0.0'
sourceSets {
main {
View
23 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>
View
2 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"/>
View
18 actionbarsherlock-samples/demos/build.gradle
@@ -1,18 +0,0 @@
-apply plugin: 'android'
-
-dependencies {
- compile project(':actionbarsherlock')
-}
-
-android {
- compileSdkVersion 14
- buildToolsVersion '17'
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- }
- }
-}
View
2 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>
View
2 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"/>
View
18 actionbarsherlock-samples/fragments/build.gradle
@@ -1,18 +0,0 @@
-apply plugin: 'android'
-
-dependencies {
- compile project(':actionbarsherlock')
-}
-
-android {
- compileSdkVersion 14
- buildToolsVersion '17'
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- }
- }
-}
View
2 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>
View
2 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"/>
View
18 actionbarsherlock-samples/known-bugs/build.gradle
@@ -1,18 +0,0 @@
-apply plugin: 'android'
-
-dependencies {
- compile project(':actionbarsherlock')
-}
-
-android {
- compileSdkVersion 14
- buildToolsVersion '17'
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- }
- }
-}
View
2 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>
View
2 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>
View
2 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"/>
View
19 actionbarsherlock-samples/roboguice/build.gradle
@@ -1,19 +0,0 @@
-apply plugin: 'android'
-
-dependencies {
- compile project(':actionbarsherlock')
- compile 'com.github.rtyley:roboguice-sherlock:1.5'
-}
-
-android {
- compileSdkVersion 14
- buildToolsVersion '17'
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- }
- }
-}
View
2 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>
View
2 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"/>
View
19 actionbarsherlock-samples/styled/build.gradle
@@ -1,19 +0,0 @@
-apply plugin: 'android'
-
-dependencies {
- compile project(':actionbarsherlock')
- compile 'com.nineoldandroids:library:2.4.0'
-}
-
-android {
- compileSdkVersion 14
- buildToolsVersion '17'
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- res.srcDirs = ['res']
- }
- }
-}
View
2 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>
View
3 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>
View
4 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 {
View
6 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>
View
4 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'
View
43 pom.xml
@@ -12,7 +12,7 @@
<groupId>com.actionbarsherlock</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<name>ActionBarSherlock (Parent)</name>
<description>Android library for implementing the action bar design pattern using the backported sources of Ice Cream Sandwich.</description>
@@ -68,13 +68,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <gradle.version>4.4.0</gradle.version>
+
<java.version>1.6</java.version>
<android.platform>14</android.platform>
<!-- Compilation dependencies -->
<android.version>4.0.1.2</android.version>
<android-support.version>r7</android-support.version>
- <fest.android.version>1.0.4</fest.android.version>
+ <fest.android.version>1.0.5</fest.android.version>
<!-- Sample dependencies -->
<nineoldandroids.version>2.4.0</nineoldandroids.version>
@@ -161,15 +163,18 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
</plugin>
<plugin>
@@ -214,6 +219,28 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>gradle</executable>
+ <arguments>
+ <argument>clean</argument>
+ <argument>assemble</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
View
7 settings.gradle
@@ -1,8 +1,3 @@
include 'actionbarsherlock'
-//include 'actionbarsherlock-fest'
+include 'actionbarsherlock-fest'
include 'actionbarsherlock-i18n'
-include 'actionbarsherlock-samples:demos'
-include 'actionbarsherlock-samples:fragments'
-include 'actionbarsherlock-samples:known-bugs'
-include 'actionbarsherlock-samples:roboguice'
-include 'actionbarsherlock-samples:styled'

0 comments on commit e2a538e

Please sign in to comment.