Small changes, new extensions, more solid

Hazer · Jun 7, 2016 · 12c4523 · 12c4523
1 parent 2b4792d
commit 12c4523
Show file tree

Hide file tree

Showing 42 changed files with 365 additions and 266 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,26 +2,14 @@
 ext {
     libraries = [
             supportVersion     : "23.4.0",
-            kotlinVersion      : '1.0.2',
             ankoVersion        : "0.8.3",
-            butterknife        : "7.0.1",
-            retrofitVersion    : "2.0.2",
-            okhttp3Version     : "3.2.0",
-            gsonVersion        : "2.6.2",
-            junitVersion       : "4.12",
-            awsSdkVersion      : '2.2.16',
-            playServicesVersion: '8.4.0',
     ]
     GROUP = "com.guizion.frameworks.yaf"
-    VERSION_NAME = "0.0.1"
+    VERSION_NAME = "0.0.2"
 }
 
 buildscript {
     ext.kotlin_version = '1.0.2'
-    ext.buildConfiguration = [
-            gradleBuildPluginVersion: "2.1.0",
-            kotlinVersion           : '1.0.2',
-    ]
     repositories {
         jcenter()
         maven {
@@ -34,15 +22,19 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:2.2.0-alpha2'
+//        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.8"
+//        classpath 'com.vanniktech:gradle-android-apk-size-plugin:0.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
+
     repositories {
         jcenter()
         maven {
@@ -59,4 +51,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/core/build.gradle b/core/build.gradle
@@ -7,6 +7,9 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
+apply plugin: 'org.jetbrains.dokka-android'
+//apply plugin: 'com.vanniktech.android.apk.size'
+
 
 def VERSION_NAME = rootProject.ext.VERSION_NAME
 def GROUP = rootProject.ext.GROUP
@@ -48,6 +51,7 @@ dependencies {
     compile 'de.halfbit:tinybus:3.0.2'
     compile 'de.halfbit:tinybus-extensions:3.0.2'
     compile 'com.android.support:multidex:1.0.1'
+    compile "com.android.support:support-v4:${libraries.supportVersion}"
 }
 
 task sourcesJar(type: Jar) {

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -1,9 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.vithor.yamvpframework.core">
-
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
-
+    <application/>
 </manifest>
diff --git a/core/src/main/java/io/vithor/yamvpframework/core/AnyExtensions.kt b/core/src/main/java/io/vithor/yamvpframework/core/AnyExtensions.kt
diff --git a/core/src/main/java/io/vithor/yamvpframework/core/BitmapUtils.kt b/core/src/main/java/io/vithor/yamvpframework/core/BitmapUtils.kt
@@ -11,7 +11,7 @@ import android.util.Base64InputStream
 import android.util.TypedValue
 import android.view.WindowManager
 import io.vithor.yamvpframework.core.YAIOUtils
-import io.vithor.yamvpframework.core.debugLog
+import io.vithor.yamvpframework.core.extensions.debugLog
 import java.io.*
 import java.nio.ByteBuffer
 
@@ -257,10 +257,11 @@ public object BitmapUtils {
         val ba = bao!!.toByteArray()
         try {
             bao.close()
-            bao = null
         } catch (e: IOException) {
             // Ignore
             e.debugLog { "io in base64" }
+        } finally {
+            bao = null
         }
 
         return "data:image/jpeg;base64," + Base64.encodeToString(ba, Base64.NO_WRAP)

diff --git a/core/src/main/java/io/vithor/yamvpframework/core/FileUtils.kt b/core/src/main/java/io/vithor/yamvpframework/core/FileUtils.kt
@@ -1,6 +1,6 @@
 package io.vithor.yamvpframework
 
-import io.vithor.yamvpframework.core.debugLog
+import io.vithor.yamvpframework.core.extensions.debugLog
 import java.io.File
 
 /**