Skip to content

Commit

Permalink
= v 1.3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
danielgomezrico committed Feb 14, 2016
1 parent 58e80a7 commit 03d4d5e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
@@ -0,0 +1,2 @@
# 1.3.0
+ Moved to kotlin.
13 changes: 6 additions & 7 deletions app/build.gradle
Expand Up @@ -18,8 +18,8 @@ apply plugin: 'io.fabric'
apply plugin: 'com.github.ben-manes.versions'

def appId = "com.makingiants.android.banjotuner"
def appVersionName = "0.1.0"
def appVersionCode = 1
def appVersionName = "1.3.0"
def appVersionCode = 13

android {
compileSdkVersion setup.targetSdk
Expand All @@ -33,20 +33,18 @@ android {
versionName appVersionName

// Add version and build number to apk name
setProperty("archivesBaseName", "today-${appVersionName}-${appVersionCode}")
setProperty("archivesBaseName", "banjen-${appVersionName}-${appVersionCode}")

resValue "string", "ads_unit_id_banner", "${ADS_UNIT_ID_BANNER}"

proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
buildTypes {
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
release {
minifyEnabled true
shrinkResources false
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -61,6 +59,7 @@ dependencies {
compile "com.android.support:appcompat-v7:${deps.supportLib}"
compile "com.android.support:support-annotations:${deps.supportLib}"
compile "com.google.android.gms:play-services-ads:${deps.playServices}"

compile "org.jetbrains.kotlin:kotlin-stdlib:$deps.kotlin"

compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true; }
Expand Down
5 changes: 4 additions & 1 deletion app/proguard-rules.pro
Expand Up @@ -12,4 +12,7 @@

# Adsense
-keep public class com.google.android.gms.ads.** { public *; }
-keep public class com.google.ads.** { public *; }
-keep public class com.google.ads.** { public *; }

# Kotlin
-dontwarn kotlin.**

0 comments on commit 03d4d5e

Please sign in to comment.