From 8391f5dd0f230ca27a8a6e5367ed0fb1f0c1b0e5 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Sat, 4 Mar 2017 14:07:14 +0800 Subject: [PATCH] reverted to kotlin 1.0.6 --- .travis.yml | 2 +- build.gradle | 2 +- gradle.properties | 16 +--------------- .../twidere/extension/GlideExtensions.kt | 2 +- .../extension/SharedPreferencesExtensions.kt | 2 +- .../mariotaku/twidere/fragment/UserFragment.kt | 4 ++-- .../view/holder/SelectableUserViewHolder.kt | 2 +- .../twidere/view/holder/StatusViewHolder.kt | 2 +- 8 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb1a383fc..f200ed826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ before_script: - test -f twidere/src/google/AndroidManifest.xml script: - - ./gradlew build + - ./gradlew clean build deploy: provider: releases diff --git a/build.gradle b/build.gradle index 35a134f39..78194c3fd 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ subprojects { buildscript { ext { libVersions = [ - Kotlin : '1.1.0', + Kotlin : '1.0.6', SupportLib : '25.2.0', MariotakuCommons: '0.9.11', RestFu : '0.9.35', diff --git a/gradle.properties b/gradle.properties index abf350c69..0fd7c658d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx10248m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -org.gradle.jvmargs=-Xmx2048M \ No newline at end of file +org.gradle.jvmargs=-Xmx4096M \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt index 3f190e070..6e0f72cc6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt @@ -96,7 +96,7 @@ fun RequestManager.loadProfileImage(context: Context, conversation: ParcelableMe fun RequestManager.loadOriginalProfileImage(context: Context, user: ParcelableUser, @ImageShapeStyle shapeStyle: Int = ImageShapeStyle.SHAPE_CIRCLE): DrawableRequestBuilder { - val original = user.extras.profile_image_url_original?.takeUnless(String::isEmpty) + val original = user.extras.profile_image_url_original?.let { if (it.isEmpty()) null else it } ?: Utils.getOriginalTwitterProfileImage(user.profile_image_url) return configureLoadProfileImage(context, shapeStyle) { load(original) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/SharedPreferencesExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/SharedPreferencesExtensions.kt index a35c6c10f..046500f30 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/SharedPreferencesExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/SharedPreferencesExtensions.kt @@ -6,5 +6,5 @@ import android.content.SharedPreferences * Created by mariotaku on 16/8/25. */ fun SharedPreferences.getNonEmptyString(key: String, def: String): String { - return getString(key, def)?.takeUnless(String::isEmpty) ?: def + return getString(key, def)?.let { if (it.isEmpty()) null else it } ?: def } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index adbc2d05d..39c7f11a9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -683,7 +683,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, }) - userFragmentView.setWindowInsetsListener { _, top, _, _ -> + userFragmentView.setWindowInsetsListener { left, top, right, bottom -> profileContentContainer.setPadding(0, top, 0, 0) profileBannerSpace.statusBarHeight = top @@ -695,7 +695,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, profileBannerSpace.toolbarHeight = toolbarHeight } } - profileContentContainer.setOnSizeChangedListener { _, _, _, _, _ -> + profileContentContainer.setOnSizeChangedListener { view, w, h, oldw, oldh -> val toolbarHeight = toolbar.measuredHeight userProfileDrawer.setPadding(0, toolbarHeight, 0, 0) profileBannerSpace.toolbarHeight = toolbarHeight diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SelectableUserViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SelectableUserViewHolder.kt index c8eae8b14..7a75f912c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SelectableUserViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SelectableUserViewHolder.kt @@ -30,7 +30,7 @@ class SelectableUserViewHolder( itemView: View, adapter: SelectableUsersAdapter ) : SimpleUserViewHolder(itemView, adapter) { - private val checkChangedListener = CompoundButton.OnCheckedChangeListener { _, value -> + private val checkChangedListener = CompoundButton.OnCheckedChangeListener { view, value -> adapter.setItemChecked(layoutPosition, value) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt index 1335b3ad4..227c62cfa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt @@ -592,7 +592,7 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View) refreshDrawableState() } - private inline val Array.type: Int get() { + private val Array.type: Int get() { forEach { if (it != null) return it.type } return 0 }