Skip to content

Commit

Permalink
Merge branch 'release/1.8.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
keyboardsurfer committed Mar 22, 2014
2 parents 4e7cb71 + 535e504 commit cb11225
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 43 deletions.
39 changes: 8 additions & 31 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ You can check some features in the Crouton Demo.
If you're already using Crouton and just want to download the latest version of the library, follow [this link](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.keyboardsurfer.android.widget%22).

## [Changelog](https://github.com/keyboardsurfer/Crouton/wiki/Changelog)
### Current version: 1.8.3
### Current version: 1.8.4

## Usage

Expand Down Expand Up @@ -66,7 +66,7 @@ Currently you can use the three different Style attributes displayed below out o

## Extension and Modification

The whole design of a Crouton is defined by [Style](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/de/keyboardsurfer/android/widget/crouton/Style.java).
The whole design of a Crouton is defined by [Style](https://github.com/keyboardsurfer/Crouton/blob/master/library/src/main/java/de/keyboardsurfer/android/widget/crouton/Style.java).

You can use one of the styles Crouton ships with: **Style.ALERT**, **Style.CONFIRM** and **Style.INFO**. Or you can create your own Style.

Expand Down Expand Up @@ -105,7 +105,7 @@ Then declare Crouton within your dependencies:
```groovy
dependencies {
...
compile('de.keyboardsurfer.android.widget:crouton:1.8.3') {
compile('de.keyboardsurfer.android.widget:crouton:1.8.4') {
// exclusion is not neccessary, but generally a good idea.
exclude group: 'com.google.android', module: 'support-v4'
}
Expand Down Expand Up @@ -152,7 +152,7 @@ If you are referencing a newer version of the Android Support Library in your ap
<groupId>de.keyboardsurfer.android.widget</groupId>
<exclusions>
<exclusion>
<groupId>com.google.android</groupId>
<groupId>com.android.support</groupId>
<artifactId>support-v4</artifactId>
</exclusion>
</exclusions>
Expand All @@ -169,38 +169,15 @@ The build requires Gradle. Operations are very simple:

After putting Crouton in a repository you can add it as dependency.

```gradle
compile('de.keyboardsurfer.android.widget:crouton:1.8.3') {
```groovy
compile('de.keyboardsurfer.android.widget:crouton:1.8.4') {
exclude group: 'com.google.android', module: 'support-v4'
}
```

###Signing

To sign your artifacts, create a file at the repository root, called `gradle.properties` that contains:


```
# makes building faster
org.gradle.daemon true
# only requried for the demo
keyStore=theKeyStoreFileName
storePassword=theStorePassword
keyAlias=theKeyAlias
keyPassword=theKeyPassword
# for uploading to a repository
repositoryUrl=yourRepositoryUrl
sonatypeUser=yourSonatypeUser
sonatypePass=yourSonatypePassword
# if you want to sign the built artifacts
signing.keyId=yourKeyId
signing.password=yourGPGPassword
signing.secretKeyRingFile=/path/to/your/secring
```
###Building and Signing

In order to build and sign Crouton locally you'll need to rename `gradle.properties.sample` to `gradle.properties`.

## Contribution

Expand Down
33 changes: 33 additions & 0 deletions gradle.properties.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# Copyright 2012 - 2014 Benjamin Weiss
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

org.gradle.daemon true

#android keystore data
keyStore=keystore.keystore
storePassword=storePass
keyAlias=keyAlias
keyPassword=somePass

#user data for sonatype
sonatypeUser=someUser
sonatypePass=somePassword
repositoryUrl=someRepo

#info from your pgp key
signing.keyId=foobar
signing.password=barfoo
signing.secretKeyRingFile=foobarbarfoo
8 changes: 4 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ apply plugin: 'android-maven'
apply plugin: 'signing'

dependencies {
compile 'com.android.support:support-v4:18.0.+'
compile 'com.android.support:support-v4:19.0.1'
}

android {
buildToolsVersion '19'
buildToolsVersion '19.0.1'
compileSdkVersion 19
defaultConfig {
versionCode 7
versionName "1.8.3"
versionName "1.8.4"
minSdkVersion 8
targetSdkVersion 19
}
Expand All @@ -39,7 +39,7 @@ android {

group = "de.keyboardsurfer.android.widget"
artifactId = "crouton"
version = "1.8.3"
version = "1.8.4"

android.libraryVariants.all { variant ->
def name = variant.buildType.name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,11 @@ private void removeAllMessagesForCrouton(Crouton crouton) {
*/
public static void announceForAccessibilityCompat(Context context, CharSequence text) {
if (Build.VERSION.SDK_INT >= 4) {
AccessibilityManager accessibilityManager = (AccessibilityManager) context.getSystemService(
Context.ACCESSIBILITY_SERVICE);
if (!accessibilityManager.isEnabled()) {
AccessibilityManager accessibilityManager = null;
if (null != context) {
accessibilityManager = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
}
if (null == accessibilityManager || !accessibilityManager.isEnabled()) {
return;
}

Expand Down
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

apply plugin: 'android'
version = '1.8.3'
version = '1.8.4'

buildscript {
repositories {
Expand All @@ -41,12 +41,12 @@ dependencies {
}

android {
buildToolsVersion '19'
buildToolsVersion '19.0.1'
compileSdkVersion 19

defaultConfig {
versionCode 13
versionName "1.8.3"
versionName "1.8.4"
minSdkVersion 8
targetSdkVersion 19
}
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.keyboardsurfer.app.demo.crouton"
android:versionCode="12"
android:versionName="1.8.2" >
android:versionCode="13"
android:versionName="1.8.4" >

<uses-sdk
android:minSdkVersion="7"
Expand Down

0 comments on commit cb11225

Please sign in to comment.