Skip to content

Commit

Permalink
Merge pull request #13 from MakinGiants/release/1.4.0
Browse files Browse the repository at this point in the history
Release/1.4.0
  • Loading branch information
danielgomezrico committed Sep 11, 2016
2 parents 9908674 + 1192966 commit eb3ce39
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 18 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,2 +1,6 @@
# 1.4.0
- Update dependencies
- Recude apk size removing uneeded files

# 1.3.0
+ Moved to kotlin.
17 changes: 8 additions & 9 deletions app/build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {

dependencies {
classpath 'io.fabric.tools:gradle:1.21.7'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$deps.kotlin"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$deps.kotlin"
}
Expand All @@ -18,19 +18,19 @@ apply plugin: 'io.fabric'
apply plugin: 'com.github.ben-manes.versions'

def appId = "com.makingiants.android.banjotuner"
def appVersionName = "1.3.1"
def appVersionCode = 14
def appVersionName = "1.4.0"
def appVersionCode = 15

android {
compileSdkVersion setup.targetSdk
buildToolsVersion setup.buildTools

signingConfigs {
release {
storeFile file(BANEJEN_SIGN_PATH)
storePassword BANEJEN_SIGN_PWD
keyAlias BANEJEN_SIGN_ALIAS
keyPassword BANEJEN_SIGN_PWD
storeFile file(BANJEN_SIGN_PATH)
storePassword BANJEN_SIGN_PWD
keyAlias BANJEN_SIGN_ALIAS
keyPassword BANJEN_SIGN_PWD
}
}

Expand Down Expand Up @@ -84,6 +84,5 @@ dependencies {

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

compile('com.crashlytics.sdk.android:crashlytics:2.5.7@aar') { transitive = true; }
compile 'com.google.android.gms:play-services-ads:9.2.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') { transitive = true; }
}
Binary file removed app/src/main/assets/b_sounds/1 - d.lite.mp3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/b_sounds/2 - b.lite.mp3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/b_sounds/3 - g.lite.mp3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/b_sounds/4 - d.lite.mp3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Expand Up @@ -53,8 +53,6 @@ class EarActivity : AppCompatActivity(), View.OnClickListener, View.OnTouchListe
super.onPause()
}

//</editor-fold>
//<editor-fold desc="UI Events">
override fun onClick(view: View?) {
val button = view as ToggleButton
soundsRadioGroup.check(button.id)
Expand Down Expand Up @@ -85,6 +83,5 @@ class EarActivity : AppCompatActivity(), View.OnClickListener, View.OnTouchListe
}
return false
}
//</editor-fold>
}

8 changes: 4 additions & 4 deletions build.gradle
@@ -1,17 +1,17 @@
buildscript {
ext.deps = [kotlin : "1.0.3",
supportLib : "24.0.0",
playServices: "9.2.0"]
supportLib : "24.2.0",
playServices: "9.4.0"]

ext.setup = [targetSdk : 24,
minSdk : 14,
buildTools: "24.0.0"]
buildTools: "24.0.2"]

repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.1.3'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Thu Jun 30 14:47:39 BRT 2016
#Wed Jul 27 18:33:49 BRT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 comments on commit eb3ce39

Please sign in to comment.