diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..ae4f0b5 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..74b7e12 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,18 +1,16 @@ - - - @@ -27,36 +25,10 @@ - - - - - - - - - - - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index bd7a8a0..bc31ce8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,5 +30,5 @@ dependencies { implementation 'com.android.support:recyclerview-v7:27.1.1' testImplementation 'junit:junit:4.12' implementation project(':treeview_lib') - // compile 'me.texy.treeview:treeview_lib:1.0.1' +// implementation 'me.texy.treeview:treeview_lib:1.0.4' } diff --git a/build.gradle b/build.gradle index 6edc868..6f9eb61 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 016b0de..42ddb06 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/treeview_lib/bintray.gradle b/treeview_lib/bintray.gradle index 789bb15..8ba95b8 100644 --- a/treeview_lib/bintray.gradle +++ b/treeview_lib/bintray.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' // This is the library version used when deploying the artifact -version = "1.0.3" +version = "1.0.4" def siteUrl = 'https://github.com/shinem/TreeView' // 项目的主页 def gitUrl = 'https://github.com/shinem/TreeView.git' // Git仓库的url diff --git a/treeview_lib/build.gradle b/treeview_lib/build.gradle index 089df1f..5d0a7bb 100644 --- a/treeview_lib/build.gradle +++ b/treeview_lib/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 27 - versionCode 4 - versionName "1.0.3" + versionCode 5 + versionName "1.0.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -32,3 +32,4 @@ dependencies { testImplementation 'junit:junit:4.12' } apply from: "bintray.gradle" +