Commit 7fb115241ec854fb7c742beaccb4da1924cd7ce3

Authored by 朱显松
1 parent 33043854

local dependency processing

.idea/gradle.xml
... ... @@ -10,6 +10,8 @@
10 10 <option value="$PROJECT_DIR$" />
11 11 <option value="$PROJECT_DIR$/app" />
12 12 <option value="$PROJECT_DIR$/cnlive" />
  13 + <option value="$PROJECT_DIR$/testlib" />
  14 + <option value="$PROJECT_DIR$/testlib2" />
13 15 </set>
14 16 </option>
15 17 <option name="resolveModulePerSourceSet" value="false" />
... ...
cnlive/build.gradle
... ... @@ -23,11 +23,18 @@ android {
23 23 dataBinding {
24 24 enabled true
25 25 }
  26 +
  27 +// lintOptions {
  28 +// abortOnError false
  29 +// }
26 30 }
27 31  
  32 +//tasks.withType(JavaCompile) {
  33 +// options.compilerArgs << "-Xlint:unchecked"
  34 +//}
  35 +
28 36 dependencies {
29 37 compile fileTree(include: ['*.jar'], dir: 'libs')
30   -
31 38 //MVP
32 39 compile 'com.hannesdorfmann.mosby3:mvp:3.0.4'
33 40 compile 'com.hannesdorfmann.mosby3:viewstate:3.0.4'
... ... @@ -45,7 +52,6 @@ dependencies {
45 52 //OKhttp
46 53 compile 'com.squareup.okhttp3:okhttp:3.8.1'
47 54 compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
48   -
49 55 //Java8
50 56 compile 'net.sourceforge.streamsupport:streamsupport:1.5.5'
51 57 compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
... ... @@ -67,7 +73,7 @@ ext {
67 73 siteUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo'
68 74 gitUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo.git'
69 75  
70   - libraryVersion = '0.1.2'
  76 + libraryVersion = '0.1.4'
71 77  
72 78 developerId = 'CNlive'
73 79 developerName = 'Granzon'
... ...
cnlive/from_bintrayv1.gradle
... ... @@ -2,6 +2,12 @@ apply plugin: &#39;com.jfrog.bintray&#39;
2 2  
3 3 version = libraryVersion
4 4  
  5 +tasks.withType(Javadoc) {//防止编码问题
  6 + options.addStringOption('Xdoclint:none', '-quiet')
  7 + options.addStringOption('encoding', 'UTF-8')
  8 + options.addStringOption('charSet', 'UTF-8')
  9 +}
  10 +
5 11 if (project.hasProperty("android")) { // Android libraries
6 12 task sourcesJar(type: Jar) {
7 13 classifier = 'sources'
... ... @@ -26,7 +32,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
26 32  
27 33 artifacts {
28 34 // archives javadocJar
29   - archives sourcesJar
  35 +// archives sourcesJar
30 36 }
31 37  
32 38 // Bintray
... ...
cnlive/from_installv1.gradle
... ... @@ -34,7 +34,19 @@ install {
34 34 connection gitUrl
35 35 developerConnection gitUrl
36 36 url siteUrl
  37 + }
37 38  
  39 + pom.whenConfigured {
  40 + pom ->
  41 + List list = new ArrayList()
  42 + pom.dependencies.findAll {
  43 + dep ->
  44 + dep.groupId == rootProject.name
  45 + }.collect {
  46 + dep ->
  47 + list.add(dep)
  48 + }
  49 + pom.dependencies.removeAll(list)
38 50 }
39 51 }
40 52 }
... ...