Skip to content

Commit

Permalink
Merge branch 'release/v5.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Sep 6, 2015
2 parents af371f5 + d400e5e commit 003174a
Show file tree
Hide file tree
Showing 12 changed files with 237 additions and 27 deletions.
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1@aar') {
compile('com.mikepenz:aboutlibraries:5.2.2@aar') {
transitive = true
}
```
Expand Down Expand Up @@ -98,22 +98,32 @@ or use the builder and add following:

```

##ProGuard
Exclude `R` from ProGuard to enable the library auto detection
```proguard
-keep class .R
-keep class .R$* {
<fields>;
}
```

##Contribute
You can contribute by creating a information file for a new library, and open a pull-request at the creators Git repository. If he doesn't include the information file in his repo, or if the library isn't maintained anymore you can create a pull-request here. Find more information in the wiki [Create a definition file](https://github.com/mikepenz/AboutLibraries/wiki/HOWTODEV:-Include-into-AboutLibraries)


##Already in use in following apps
(feel free to send me new projects)

* [wallsplash](https://play.google.com/store/apps/details?id=com.mikepenz.unsplash)
* [Numbers](https://play.google.com/store/apps/details?id=com.tundem.numbersreloaded.free)
* [MegaYatzy](https://play.google.com/store/apps/details?id=com.tundem.yatzyTJ)

* [Sir Spellalot](https://play.google.com/store/apps/details?id=com.sirspellalot.app.android)
* [TVShow Time](https://play.google.com/store/apps/details?id=com.tozelabs.tvshowtime)
* [Strength](https://play.google.com/store/apps/details?id=com.e13engineering.strength)
* [Sprit Club](https://play.google.com/store/apps/details?id=at.idev.spritpreise)
* [Hold'Em Poker Manager](https://play.google.com/store/apps/details?id=pt.massena.holdemtracker.free)
* [PixCell8](https://play.google.com/store/apps/details?id=com.pixcell8.prod)
* [ML Manager](https://play.google.com/store/apps/details?id=com.javiersantos.mlmanager)


#Developed By
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.android.tools.build:gradle:1.3.1'
}
}

Expand All @@ -17,5 +17,5 @@ allprojects {
}

task wrapper(type: Wrapper) {
gradleVersion = '2.5'
gradleVersion = '2.6'
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1
VERSION_CODE=521
VERSION_NAME=5.2.2
VERSION_CODE=522
GROUP=com.mikepenz

POM_DESCRIPTION=AboutLibraries Library
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Dec 18 23:09:33 CET 2014
#Tue Sep 01 19:53:29 CEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
13 changes: 6 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 23
buildToolsVersion '23'
buildToolsVersion '23.0.1'

defaultConfig {
minSdkVersion 10
targetSdkVersion 23
versionCode 521
versionName '5.2.1'
versionCode 522
versionName '5.2.2'
}

buildTypes {
Expand All @@ -26,8 +26,7 @@ android {
apply from: 'gradle-mvn-push.gradle'

dependencies {
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'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:cardview-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1</string>
<string name="library_AboutLibraries_libraryVersion">5.2.2</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>
Expand Down
23 changes: 23 additions & 0 deletions library/src/main/res/values/library_ddplist_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="define_int_ddplist">year;owner</string>
<string name="library_ddplist_author">Daniel Dreibrodt</string>
<string name="library_ddplist_libraryName">dd-plist</string>
<string name="library_ddplist_libraryDescription">
<![CDATA[
This library enables your Java application to handle property lists of various formats.
<br><br>
Property lists are files used to store user settings and serialized objects. They originate from the NeXSTEP programming environment and are now a basic part of the Cocoa framework (OS X and iOS) as well as the GNUstep framework.
]]>
</string>
<string name="library_ddplist_libraryVersion">1.3</string>
<string name="library_ddplist_libraryWebsite">https://groups.google.com/forum/#!forum/plist-discuss</string>
<string name="library_ddplist_licenseId">mit</string>
<string name="library_ddplist_isOpenSource">true</string>
<string name="library_ddplist_repositoryLink">https://github.com/3breadt/dd-plist</string>
<string name="library_ddplist_classPath">com.dd.plist.NSNumber</string>
<!-- Custom variables section -->
<string name="library_ddplist_owner">Daniel Dreibrodt</string>
<string name="library_ddplist_year">2015</string>
</resources>

17 changes: 17 additions & 0 deletions library/src/main/res/values/library_encryption_strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="define_int_encryption">year;owner</string>
<string name="library_encryption_author">simbiose</string>
<string name="library_encryption_libraryName">Encryption</string>
<string name="library_encryption_libraryDescription">Encryption is a simple way to create encrypted strings to Android project.</string>
<string name="library_encryption_libraryVersion">1.2.0</string>
<string name="library_encryption_libraryWebsite">https://github.com/simbiose/Encryption</string>
<string name="library_encryption_licenseId">lgpl_3_0</string>
<string name="library_encryption_isOpenSource">true</string>
<string name="library_encryption_repositoryLink">https://github.com/simbiose/Encryption</string>
<string name="library_encryption_classPath">se.simbio.encryption.Encryption</string>
<!-- Custom variables section -->
<string name="library_encryption_owner">simbiose</string>
<string name="library_encryption_year">2015</string>
</resources>

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="define_int_intellijannotations">year;owner</string>
<string name="library_intellijannotations_author">Jetbrain developers</string>
<string name="library_intellijannotations_libraryName">IntelliJ IDEA Annotations</string>
<string name="library_intellijannotations_libraryDescription">A set of annotations used for code inspection support and code documentation.</string>
<string name="library_intellijannotations_libraryVersion">12.0.0</string>
<string name="library_intellijannotations_libraryWebsite">http://www.jetbrains.org</string>
<string name="library_intellijannotations_licenseId">apache_2_0</string>
<string name="library_intellijannotations_isOpenSource">false</string>
<string name="library_intellijannotations_classPath">org.jetbrains.annotations.Nullable</string>
<!-- Custom variables section -->
<string name="library_intellijannotations_owner">Jetbrain developers</string>
<string name="library_intellijannotations_year">2015</string>
</resources>

Loading

0 comments on commit 003174a

Please sign in to comment.