Skip to content

Commit

Permalink
Merge pull request #106 from luckybilly/dev
Browse files Browse the repository at this point in the history
升级到2.1.4
  • Loading branch information
luckybilly committed Feb 18, 2019
2 parents c3c571b + 0bef9af commit 8403dca
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -39,7 +39,7 @@ ext {
supportVersion = '25.3.1'

deps = [
cc : 'com.billy.android:cc:2.1.2'
cc : 'com.billy.android:cc:2.1.4'
// cc : project(':cc')
]
}
Expand Down
2 changes: 1 addition & 1 deletion cc-settings-2.gradle
Expand Up @@ -8,7 +8,7 @@
project.apply plugin: 'cc-register'
def dependencyMode = GradleVersion.version(project.gradle.gradleVersion) >= GradleVersion.version('4.1') ? 'api' : 'compile'
//project.dependencies.add(dependencyMode, project(":cc"))
project.dependencies.add(dependencyMode, "com.billy.android:cc:2.1.3") //用最新版
project.dependencies.add(dependencyMode, "com.billy.android:cc:2.1.4") //用最新版

//此文件是作为组件化配置的公共gradle脚本文件,在每个组件中都apply此文件,下载到工程根目录后,可以在下方添加一些自己工程中通用的配置
// 可参考cc-settings-demo.gradle
Expand Down
2 changes: 1 addition & 1 deletion cc/build.gradle
Expand Up @@ -52,7 +52,7 @@ ext {
siteUrl = 'https://github.com/luckybilly/CC'
gitUrl = 'git@github.com:luckybilly/CC.git'

libraryVersion = '2.1.3'
libraryVersion = '2.1.4'

developerId = 'billy'
developerName = 'billy'
Expand Down
Expand Up @@ -6,8 +6,6 @@
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.Size;
import android.util.SizeF;
import android.util.SparseArray;

import com.billy.cc.core.component.CC;
Expand Down Expand Up @@ -112,7 +110,7 @@ static Object convertParam(Object v) {
|| v instanceof Bundle
|| v instanceof Parcelable || v instanceof Parcelable[]
|| v instanceof CharSequence[] || v instanceof IBinder
|| v instanceof Size || v instanceof SizeF ) {
) {
return v;
} else if (v instanceof SparseArray) {
SparseArray sa = (SparseArray) v;
Expand Down

0 comments on commit 8403dca

Please sign in to comment.