Skip to content

Commit

Permalink
version bump of sample app
Browse files Browse the repository at this point in the history
  • Loading branch information
scottyab committed Jul 1, 2016
1 parent 8156ec0 commit 0303b36
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
19 changes: 9 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
compileSdkVersion 24
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "com.scottyab.rootbeer.sample"
minSdkVersion 10
targetSdkVersion 22
versionCode 3
versionName "0.3"
versionCode 4
versionName "0.4"
}


//check if the keystore details are defined in gradle.properties (this is so the key is not in github)
if(project.hasProperty("ROOTBEER_SAMPLE_STORE")) {
if (project.hasProperty("ROOTBEER_SAMPLE_STORE")) {
signingConfigs {
//from ~/user/.gradle/gradle.properties
release {
Expand All @@ -27,13 +26,13 @@ android {
}

buildTypes {
debug{
debug {
applicationIdSuffix ".debug"
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
}
release {
if(project.hasProperty("ROOTBEER_SAMPLE_STORE")) {
if (project.hasProperty("ROOTBEER_SAMPLE_STORE")) {
signingConfig signingConfigs.release
}
minifyEnabled false
Expand All @@ -44,9 +43,9 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project (':rootbeerlib')
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:design:22.2.1'
compile project(':rootbeerlib')
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:design:24.0.0'
compile 'com.nineoldandroids:library:2.4.0'
compile 'uk.co.barbuzz:beerprogressview:0.0.4'
}
14 changes: 8 additions & 6 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.scottyab.rootbeer.sample" >
<manifest package="com.scottyab.rootbeer.sample"
xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" >
android:theme="@style/AppTheme.NoActionBar">
<activity
android:name=".MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:screenOrientation="portrait"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
Expand Down

0 comments on commit 0303b36

Please sign in to comment.