Commit 7fb115241ec854fb7c742beaccb4da1924cd7ce3

Authored by 朱显松
1 parent 33043854

local dependency processing

.idea/gradle.xml
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
10 <option value="$PROJECT_DIR$" /> 10 <option value="$PROJECT_DIR$" />
11 <option value="$PROJECT_DIR$/app" /> 11 <option value="$PROJECT_DIR$/app" />
12 <option value="$PROJECT_DIR$/cnlive" /> 12 <option value="$PROJECT_DIR$/cnlive" />
  13 + <option value="$PROJECT_DIR$/testlib" />
  14 + <option value="$PROJECT_DIR$/testlib2" />
13 </set> 15 </set>
14 </option> 16 </option>
15 <option name="resolveModulePerSourceSet" value="false" /> 17 <option name="resolveModulePerSourceSet" value="false" />
cnlive/build.gradle
@@ -23,11 +23,18 @@ android { @@ -23,11 +23,18 @@ android {
23 dataBinding { 23 dataBinding {
24 enabled true 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 dependencies { 36 dependencies {
29 compile fileTree(include: ['*.jar'], dir: 'libs') 37 compile fileTree(include: ['*.jar'], dir: 'libs')
30 -  
31 //MVP 38 //MVP
32 compile 'com.hannesdorfmann.mosby3:mvp:3.0.4' 39 compile 'com.hannesdorfmann.mosby3:mvp:3.0.4'
33 compile 'com.hannesdorfmann.mosby3:viewstate:3.0.4' 40 compile 'com.hannesdorfmann.mosby3:viewstate:3.0.4'
@@ -45,7 +52,6 @@ dependencies { @@ -45,7 +52,6 @@ dependencies {
45 //OKhttp 52 //OKhttp
46 compile 'com.squareup.okhttp3:okhttp:3.8.1' 53 compile 'com.squareup.okhttp3:okhttp:3.8.1'
47 compile 'com.squareup.okhttp3:logging-interceptor:3.8.1' 54 compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
48 -  
49 //Java8 55 //Java8
50 compile 'net.sourceforge.streamsupport:streamsupport:1.5.5' 56 compile 'net.sourceforge.streamsupport:streamsupport:1.5.5'
51 compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5' 57 compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
@@ -67,7 +73,7 @@ ext { @@ -67,7 +73,7 @@ ext {
67 siteUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo' 73 siteUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo'
68 gitUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo.git' 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 developerId = 'CNlive' 78 developerId = 'CNlive'
73 developerName = 'Granzon' 79 developerName = 'Granzon'
cnlive/from_bintrayv1.gradle
@@ -2,6 +2,12 @@ apply plugin: &#39;com.jfrog.bintray&#39; @@ -2,6 +2,12 @@ apply plugin: &#39;com.jfrog.bintray&#39;
2 2
3 version = libraryVersion 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 if (project.hasProperty("android")) { // Android libraries 11 if (project.hasProperty("android")) { // Android libraries
6 task sourcesJar(type: Jar) { 12 task sourcesJar(type: Jar) {
7 classifier = 'sources' 13 classifier = 'sources'
@@ -26,7 +32,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) { @@ -26,7 +32,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
26 32
27 artifacts { 33 artifacts {
28 // archives javadocJar 34 // archives javadocJar
29 - archives sourcesJar 35 +// archives sourcesJar
30 } 36 }
31 37
32 // Bintray 38 // Bintray
cnlive/from_installv1.gradle
@@ -34,7 +34,19 @@ install { @@ -34,7 +34,19 @@ install {
34 connection gitUrl 34 connection gitUrl
35 developerConnection gitUrl 35 developerConnection gitUrl
36 url siteUrl 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 }