Merge branch 'release/1.0.3'

CHANGELOG.md

@@ -12,3 +12,7 @@ Added support for Interpolators + update demo Activity
 1.0.2
 -----
 Fixed some issues related to rotating a device from portrait to landscape (and the other way around)
+
+1.0.3
+-----
+Removed attributes from AndroidManifest, because they may conflict with the ones in your app AndroidManifest

README.md

@@ -8,7 +8,7 @@ Demo
 ----
 This repository also contains a demo project.
 
-![Demo](https://raw.githubusercontent.com/Blogcat/Android-ExpandableTextView/release/1.0.2/demo.gif)
+![Demo](https://raw.githubusercontent.com/Blogcat/Android-ExpandableTextView/release/1.0.3/demo.gif)
 
 Add dependency
 --------------
@@ -32,7 +32,7 @@ library dependency
 
 ```groovy
 	dependencies {
-	    compile ('at.blogc:expandabletextview:1.0.2@aar')
+	    compile 'at.blogc:expandabletextview:1.0.3'
 	}
 ```
 

expandabletextview/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-def fullVersion = '1.0.2'
+def fullVersion = '1.0.3'
 
 group = 'at.blogc'
 version = fullVersion

expandabletextview/src/main/AndroidManifest.xml

@@ -13,14 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest package="at.blogc.expandabletextview"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    package="at.blogc.expandabletextview"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
+    <application/>
 
 </manifest>