diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9c45cdfa..94b42dfcf 100644
--- 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
new file mode 100644
index 000000000..38892962b
--- /dev/null
+++ b/actionbarsherlock-fest/AndroidManifest.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/actionbarsherlock-fest/build.gradle b/actionbarsherlock-fest/build.gradle
index 69992cdd6..1dcbf359f 100644
--- 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
index 324fc693a..ab27d59d4 100644
--- a/actionbarsherlock-fest/pom.xml
+++ b/actionbarsherlock-fest/pom.xml
@@ -8,7 +8,7 @@
com.actionbarsherlock
parent
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
@@ -35,4 +35,29 @@
fest-android
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ package
+
+ attach-artifact
+
+
+
+
+ aar
+ ${project.basedir}/build//libs/${project.artifactId}-${gradle.version}.aar
+
+
+
+
+
+
+
+
diff --git a/actionbarsherlock-i18n/AndroidManifest.xml b/actionbarsherlock-i18n/AndroidManifest.xml
index e303a8cef..5d86c3aa8 100644
--- a/actionbarsherlock-i18n/AndroidManifest.xml
+++ b/actionbarsherlock-i18n/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/actionbarsherlock-i18n/build.gradle b/actionbarsherlock-i18n/build.gradle
index 188104e3a..0399e5e7b 100644
--- 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
index badf76467..8eb95c5a6 100644
--- a/actionbarsherlock-i18n/pom.xml
+++ b/actionbarsherlock-i18n/pom.xml
@@ -9,7 +9,7 @@
com.actionbarsherlock
parent
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
@@ -53,6 +53,27 @@
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ package
+
+ attach-artifact
+
+
+
+
+ aar
+ ${project.basedir}/build/libs/${project.artifactId}-${gradle.version}.aar
+
+
+
+
+
+
diff --git a/actionbarsherlock-samples/demos/AndroidManifest.xml b/actionbarsherlock-samples/demos/AndroidManifest.xml
index 37ca22d7d..0a959d462 100644
--- a/actionbarsherlock-samples/demos/AndroidManifest.xml
+++ b/actionbarsherlock-samples/demos/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/actionbarsherlock-samples/demos/build.gradle b/actionbarsherlock-samples/demos/build.gradle
deleted file mode 100644
index b44e0fdc4..000000000
--- a/actionbarsherlock-samples/demos/build.gradle
+++ /dev/null
@@ -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']
- }
- }
-}
diff --git a/actionbarsherlock-samples/demos/pom.xml b/actionbarsherlock-samples/demos/pom.xml
index a52b8b708..70d4c09be 100644
--- a/actionbarsherlock-samples/demos/pom.xml
+++ b/actionbarsherlock-samples/demos/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent-sample
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
diff --git a/actionbarsherlock-samples/fragments/AndroidManifest.xml b/actionbarsherlock-samples/fragments/AndroidManifest.xml
index 013c5c143..90b53b014 100644
--- 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. -->
+ to come from a domain that you own or have control over. -->
diff --git a/actionbarsherlock-samples/fragments/build.gradle b/actionbarsherlock-samples/fragments/build.gradle
deleted file mode 100644
index b44e0fdc4..000000000
--- a/actionbarsherlock-samples/fragments/build.gradle
+++ /dev/null
@@ -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']
- }
- }
-}
diff --git a/actionbarsherlock-samples/fragments/pom.xml b/actionbarsherlock-samples/fragments/pom.xml
index e91c8f52b..766f82c8c 100644
--- a/actionbarsherlock-samples/fragments/pom.xml
+++ b/actionbarsherlock-samples/fragments/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent-sample
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
diff --git a/actionbarsherlock-samples/known-bugs/AndroidManifest.xml b/actionbarsherlock-samples/known-bugs/AndroidManifest.xml
index 9edacb4bd..4864ff672 100644
--- a/actionbarsherlock-samples/known-bugs/AndroidManifest.xml
+++ b/actionbarsherlock-samples/known-bugs/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/actionbarsherlock-samples/known-bugs/build.gradle b/actionbarsherlock-samples/known-bugs/build.gradle
deleted file mode 100644
index b44e0fdc4..000000000
--- a/actionbarsherlock-samples/known-bugs/build.gradle
+++ /dev/null
@@ -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']
- }
- }
-}
diff --git a/actionbarsherlock-samples/known-bugs/pom.xml b/actionbarsherlock-samples/known-bugs/pom.xml
index 178c11840..74b6d924e 100644
--- a/actionbarsherlock-samples/known-bugs/pom.xml
+++ b/actionbarsherlock-samples/known-bugs/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent-sample
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
diff --git a/actionbarsherlock-samples/pom.xml b/actionbarsherlock-samples/pom.xml
index c6ddc0c9f..8ba8ee546 100644
--- a/actionbarsherlock-samples/pom.xml
+++ b/actionbarsherlock-samples/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
diff --git a/actionbarsherlock-samples/roboguice/AndroidManifest.xml b/actionbarsherlock-samples/roboguice/AndroidManifest.xml
index 206608a53..1760c0154 100644
--- a/actionbarsherlock-samples/roboguice/AndroidManifest.xml
+++ b/actionbarsherlock-samples/roboguice/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/actionbarsherlock-samples/roboguice/build.gradle b/actionbarsherlock-samples/roboguice/build.gradle
deleted file mode 100644
index 55b8d1990..000000000
--- a/actionbarsherlock-samples/roboguice/build.gradle
+++ /dev/null
@@ -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']
- }
- }
-}
diff --git a/actionbarsherlock-samples/roboguice/pom.xml b/actionbarsherlock-samples/roboguice/pom.xml
index e9c521903..f0b0b2215 100644
--- a/actionbarsherlock-samples/roboguice/pom.xml
+++ b/actionbarsherlock-samples/roboguice/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent-sample
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
diff --git a/actionbarsherlock-samples/styled/AndroidManifest.xml b/actionbarsherlock-samples/styled/AndroidManifest.xml
index 4ae3505b0..1859288c5 100644
--- a/actionbarsherlock-samples/styled/AndroidManifest.xml
+++ b/actionbarsherlock-samples/styled/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/actionbarsherlock-samples/styled/build.gradle b/actionbarsherlock-samples/styled/build.gradle
deleted file mode 100644
index 476707aea..000000000
--- a/actionbarsherlock-samples/styled/build.gradle
+++ /dev/null
@@ -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']
- }
- }
-}
diff --git a/actionbarsherlock-samples/styled/pom.xml b/actionbarsherlock-samples/styled/pom.xml
index 512e67336..4ddfa368d 100644
--- a/actionbarsherlock-samples/styled/pom.xml
+++ b/actionbarsherlock-samples/styled/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent-sample
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
diff --git a/actionbarsherlock/AndroidManifest.xml b/actionbarsherlock/AndroidManifest.xml
index 315e8a516..ca0fb7cee 100644
--- a/actionbarsherlock/AndroidManifest.xml
+++ b/actionbarsherlock/AndroidManifest.xml
@@ -1,4 +1,5 @@
-
+
+
diff --git a/actionbarsherlock/build.gradle b/actionbarsherlock/build.gradle
index 5b0516202..41bbe1d9b 100644
--- 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
index f21327f81..0d7c03e49 100644
--- a/actionbarsherlock/pom.xml
+++ b/actionbarsherlock/pom.xml
@@ -6,7 +6,7 @@
com.actionbarsherlock
parent
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
../pom.xml
@@ -97,6 +97,10 @@
jar
${project.build.directory}/${project.build.finalName}.jar
+
+ aar
+ ${project.basedir}/build/libs/${project.artifactId}-${gradle.version}.aar
+
diff --git a/build.gradle b/build.gradle
index 015b003ae..b426f2115 100644
--- 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'
diff --git a/pom.xml b/pom.xml
index a19f84bbb..a828adef8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
com.actionbarsherlock
parent
pom
- 4.3.2-SNAPSHOT
+ 4.4.0-SNAPSHOT
ActionBarSherlock (Parent)
Android library for implementing the action bar design pattern using the backported sources of Ice Cream Sandwich.
@@ -68,13 +68,15 @@
UTF-8
UTF-8
+ 4.4.0
+
1.6
14
4.0.1.2
r7
- 1.0.4
+ 1.0.5
2.4.0
@@ -161,15 +163,18 @@
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.9
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.8
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.7
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.9
+
+ false
+
@@ -214,6 +219,28 @@
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.2.1
+ false
+
+
+ package
+
+ exec
+
+
+ gradle
+
+ clean
+ assemble
+
+
+
+
+
diff --git a/settings.gradle b/settings.gradle
index 3dfbf83e6..59af83ffb 100644
--- a/settings.gradle
+++ b/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'