diff --git a/app/build.gradle b/app/build.gradle index 6d2e8ec..172cc8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,8 +43,8 @@ android { dependencies { compile project(':componentservice') compile 'com.android.support.constraint:constraint-layout:1.0.2' - annotationProcessor project(':router-anno-compiler') -// annotationProcessor 'com.github.mqzhangw:JIMU:router-anno-compiler-1.0.1' +// annotationProcessor project(':router-anno-compiler') + annotationProcessor 'com.github.jimu:router-anno-compiler:1.0.1' } combuild { diff --git a/basiclib/build.gradle b/basiclib/build.gradle index 922952b..f71178d 100644 --- a/basiclib/build.gradle +++ b/basiclib/build.gradle @@ -29,9 +29,8 @@ dependencies { compile 'com.android.support:appcompat-v7:26.+' testCompile 'junit:junit:4.12' compile 'com.squareup.picasso:picasso:2.5.2' -// compile ('com.github.mqzhangw:JIMU:componentlib-1.3.1',{ -// exclude group: 'com.android.support', module: 'appcompat-v7' -// }) + compile project(":componentlib") + compile 'com.github.jimu:componentlib:1.3.1' } diff --git a/build.gradle b/build.gradle index e0a4cbf..24830ab 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,9 @@ buildscript { url 'https://maven.google.com/' name 'Google' } + maven { + url 'https://dl.bintray.com/leobert-lan-oss/maven/' + } } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' @@ -23,6 +26,9 @@ allprojects { repositories { jcenter() maven { url 'https://jitpack.io' } + maven { + url 'https://dl.bintray.com/leobert-lan-oss/maven/' + } maven { url 'https://maven.google.com/' name 'Google' diff --git a/componentlib/build.gradle b/componentlib/build.gradle index 3b5c95e..c3bd3a5 100644 --- a/componentlib/build.gradle +++ b/componentlib/build.gradle @@ -9,7 +9,7 @@ ext { artifact = bintrayName libraryName = 'component build lib ' libraryDescription = 'component build lib ' - libraryVersion = "1.3.0" + libraryVersion = "1.3.1" licenseName = 'The Apache Software License, Version 2.0' licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' allLicenses = ["Apache-2.0"] @@ -43,10 +43,8 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testCompile 'junit:junit:4.12' - compile project(':router-annotation') -// compile('com.github.mqzhangw:JIMU:router-anno-1.0.1@jar', { -// exclude group: 'com.android.support' -// }) +// compile project(':router-annotation') + compile 'com.github.jimu:router-annotation:1.0.1' compile 'com.google.code.gson:gson:2.8.2' } diff --git a/gradle.properties b/gradle.properties index e4d5af6..72bd996 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,10 +12,10 @@ org.gradle.jvmargs=-Xmx1536m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true mainmodulename=app -bintrayRepo=compbuild -publishedGroupId=com.luojilab.ddcomponent -siteUrl=https://github.com/luojilab/DDComponentForAndroid -gitUrl=https://github.com/luojilab/DDComponentForAndroid.git +bintrayRepo=maven +publishedGroupId=com.github.jimu +siteUrl=https://github.com/mqzhangw/JIMU +gitUrl=https://github.com/mqzhangw/JIMU.git developerId=mqzhang developerName=mqzhang developerEmail=zhmqq0527@gmail.com diff --git a/readercomponent/build.gradle b/readercomponent/build.gradle index 29b463c..e00c6f0 100644 --- a/readercomponent/build.gradle +++ b/readercomponent/build.gradle @@ -39,8 +39,8 @@ android { dependencies { compile project(':componentservice') compile fileTree(include: ['*.jar'], dir: 'libs') -// annotationProcessor 'com.luojilab.ddcomponent:router-anno-compiler:1.0.0' - annotationProcessor project(':router-anno-compiler') + annotationProcessor 'com.github.jimu:router-anno-compiler:1.0.1' +// annotationProcessor project(':router-anno-compiler') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/router-anno-compiler/build.gradle b/router-anno-compiler/build.gradle index 6b31471..87df62c 100644 --- a/router-anno-compiler/build.gradle +++ b/router-anno-compiler/build.gradle @@ -23,7 +23,8 @@ dependencies { compile 'org.apache.commons:commons-lang3:3.4' compile 'org.apache.commons:commons-collections4:4.1' - compile project(':router-annotation') +// compile project(':router-annotation') + compile 'com.github.jimu:router-annotation:1.0.1' } diff --git a/router-annotation/build.gradle b/router-annotation/build.gradle index f2152ab..8726010 100644 --- a/router-annotation/build.gradle +++ b/router-annotation/build.gradle @@ -1,6 +1,9 @@ apply plugin: 'java' +group="com.github.jimu" + ext { + bintrayRepo = 'maven' bintrayName = 'router-annotation' artifact = bintrayName libraryName = 'router-annotation ' diff --git a/sharecomponent/build.gradle b/sharecomponent/build.gradle index 8e8ae26..1deab77 100644 --- a/sharecomponent/build.gradle +++ b/sharecomponent/build.gradle @@ -34,8 +34,8 @@ android { dependencies { compile project(':componentservice') -// annotationProcessor 'com.luojilab.ddcomponent:router-anno-compiler:1.0.0' - annotationProcessor project(':router-anno-compiler') + annotationProcessor 'com.github.jimu:router-anno-compiler:1.0.1' +// annotationProcessor project(':router-anno-compiler') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/sharecomponentkotlin/build.gradle b/sharecomponentkotlin/build.gradle index c074cfa..f3cecd9 100644 --- a/sharecomponentkotlin/build.gradle +++ b/sharecomponentkotlin/build.gradle @@ -39,8 +39,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':componentservice') -// kapt 'com.luojilab.ddcomponent:router-anno-compiler:1.0.0' - kapt project(':router-anno-compiler') +// kapt project(':router-anno-compiler') + kapt 'com.github.jimu:router-anno-compiler:1.0.1' compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" }