Merge branch 'release/v5.2.0'

mikepenz · Aug 21, 2015 · d6b394e · d6b394e
2 parents c7ee4c9 + 3f55174
commit d6b394e
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ You can find anything you search for in the wiki. (If not open an issue)
 The AboutLibraries Library is pushed to [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22com.mikepenz%22), so you just need to add the following dependency to your `build.gradle`. It seems it is also required to add the support dependencies to the application. If it works without, you should be fine too :).
 
 ```javascript
-compile('com.mikepenz:aboutlibraries:5.1.1@aar') {
+compile('com.mikepenz:aboutlibraries:5.2.0@aar') {
 	transitive = true
 }
 ```

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
@@ -17,5 +17,5 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
+    gradleVersion = '2.5'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=5.1.1
-VERSION_CODE=511
+VERSION_NAME=5.2.0
+VERSION_CODE=520
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=AboutLibraries Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 23
+    buildToolsVersion '23'
 
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 22
-        versionCode 511
-        versionName '5.1.1'
+        targetSdkVersion 23
+        versionCode 520
+        versionName '5.2.0'
     }
 
     buildTypes {
@@ -26,8 +26,8 @@ android {
 apply from: 'gradle-mvn-push.gradle'
 
 dependencies {
-    compile 'com.android.support:support-v4:22.2.1'
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:cardview-v7:22.2.1'
-    compile 'com.android.support:recyclerview-v7:22.2.1'
+    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:cardview-v7:23.0.0'
+    compile 'com.android.support:recyclerview-v7:23.0.0'
 }
diff --git a/library/src/main/res/values/library_aboutlibraries_strings.xml b/library/src/main/res/values/library_aboutlibraries_strings.xml
@@ -12,7 +12,7 @@
         Most modern apps feature an "Used Library"-Section and for this some information of those libs is required. As it gets annoying to copy those strings always to your app I have developed this small helper library to provide the required information.
         ]]>
     </string>
-    <string name="library_AboutLibraries_libraryVersion">5.1.1</string>
+    <string name="library_AboutLibraries_libraryVersion">5.2.0</string>
     <string name="library_AboutLibraries_libraryWebsite">https://github.com/mikepenz/AboutLibraries</string>
     <string name="library_AboutLibraries_licenseId">apache_2_0</string>
     <string name="library_AboutLibraries_isOpenSource">true</string>

diff --git a/library/src/main/res/values/library_androidin_appbillingv3_strings.xml b/library/src/main/res/values/library_androidin_appbillingv3_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+	<string name="define_int_androidin_appbillingv3"></string>
+	<!-- Author section -->
+	<string name="library_androidin_appbillingv3_author">Sergey A. Glukhov</string>
+	<string name="library_androidin_appbillingv3_authorWebsite"> https://github.com/serggl</string>
+	<!-- Library section -->
+	<string name="library_androidin_appbillingv3_libraryName">Android In-App Billing v3</string>
+	<string name="library_androidin_appbillingv3_libraryDescription">This is a simple, straight-forward implementation of the Android v3 In-app billing API.  It supports: In-App Product Purchases (both non-consumable and consumable) and Subscriptions.</string>
+	<string name="library_androidin_appbillingv3_libraryWebsite"></string>
+	<string name="library_androidin_appbillingv3_libraryVersion">1.0.26</string>
+	<!-- OpenSource section -->
+	<string name="library_androidin_appbillingv3_isOpenSource">true</string>
+	<string name="library_androidin_appbillingv3_repositoryLink">https://github.com/anjlab/android-inapp-billing-v3</string>
+	<!-- ClassPath for autoDetect section -->
+	<string name="library_androidin_appbillingv3_classPath">com.anjlab.android.iab.v3.BillingBase</string>
+	<!-- License section -->
+	<string name="library_androidin_appbillingv3_licenseId">apache_2_0</string>
+	<!-- Custom variables section -->
+</resources>
diff --git a/library/src/main/res/values/library_dagger2_strings.xml b/library/src/main/res/values/library_dagger2_strings.xml
@@ -6,7 +6,7 @@
     <string name="library_Dagger2_libraryDescription">A fast dependency injector for Android and Java.</string>
     <string name="library_Dagger2_libraryVersion">2.0.0</string>
     <string name="library_Dagger2_libraryWebsite">https://google.github.io/dagger/</string>
-    <string name="library_Dagger2_licenseId">apache_2_2</string>
+    <string name="library_Dagger2_licenseId">apache_2_0</string>
     <string name="library_Dagger2_isOpenSource">true</string>
     <string name="library_Dagger2_repositoryLink">https://github.com/google/dagger</string>
     <string name="library_Dagger2_classPath">dagger.Component</string>

diff --git a/library/src/main/res/values/library_dagger_strings.xml b/library/src/main/res/values/library_dagger_strings.xml
@@ -6,7 +6,7 @@
     <string name="library_Dagger_libraryDescription">A fast dependency injector for Android and Java.</string>
     <string name="library_Dagger_libraryVersion">1.2.2</string>
     <string name="library_Dagger_libraryWebsite">http://square.github.io/dagger/</string>
-    <string name="library_Dagger_licenseId">apache_2_2</string>
+    <string name="library_Dagger_licenseId">apache_2_0</string>
     <string name="library_Dagger_isOpenSource">true</string>
     <string name="library_Dagger_repositoryLink">https://github.com/square/dagger</string>
     <string name="library_Dagger_classPath">dagger.ObjectGraph</string>

diff --git a/library/src/main/res/values/library_easyandroidanimations_strings.xml b/library/src/main/res/values/library_easyandroidanimations_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+	<string name="define_int_easyandroidanimations"></string>
+	<!-- Author section -->
+	<string name="library_easyandroidanimations_author">2359media</string>
+	<string name="library_easyandroidanimations_authorWebsite">http://2359media.com/</string>
+	<!-- Library section -->
+	<string name="library_easyandroidanimations_libraryName">EasyAndroidAnimations</string>
+	<string name="library_easyandroidanimations_libraryDescription">Easy Android Animations is an animation library that aims to make android animations easier, with 50+ builtin animations, it allows you to introduce many complex animation effects in your application with one or two lines of code.</string>
+	<string name="library_easyandroidanimations_libraryWebsite"></string>
+	<string name="library_easyandroidanimations_libraryVersion">0.8</string>
+	<!-- OpenSource section -->
+	<string name="library_easyandroidanimations_isOpenSource">true</string>
+	<string name="library_easyandroidanimations_repositoryLink">https://github.com/2359media/EasyAndroidAnimations</string>
+	<!-- ClassPath for autoDetect section -->
+	<string name="library_easyandroidanimations_classPath">com.easyandroidanimations.library.Animation</string>
+	<!-- License section -->
+	<string name="library_easyandroidanimations_licenseId">apache_2_0</string>
+	<!-- Custom variables section -->
+</resources>
diff --git a/library/src/main/res/values/library_recyclerviewanimators_strings.xml b/library/src/main/res/values/library_recyclerviewanimators_strings.xml
@@ -14,7 +14,7 @@
 	<string name="library_recyclerviewanimators_isOpenSource">true</string>
 	<string name="library_recyclerviewanimators_repositoryLink">https://github.com/wasabeef/recyclerview-animators</string>
 	<!-- ClassPath for autoDetect section -->
-	<string name="library_recyclerviewanimators_classPath">jp.wasabeef.recyclerview.animators. BaseItemAnimator</string>
+	<string name="library_recyclerviewanimators_classPath">jp.wasabeef.recyclerview.animators.BaseItemAnimator</string>
 	<!-- License section -->
 	<string name="library_recyclerviewanimators_licenseId">apache_2_0</string>
 	<!-- Custom variables section -->

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -7,14 +7,14 @@ try {
 
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 23
+    buildToolsVersion '23'
     defaultConfig {
         applicationId 'com.mikepenz.aboutlibraries.sample'
         minSdkVersion 11
-        targetSdkVersion 22
-        versionCode 511
-        versionName '5.1.1'
+        targetSdkVersion 23
+        versionCode 520
+        versionName '5.2.0'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->