From 61e3dbe8c225c29391d598115eaefa63fe5205f8 Mon Sep 17 00:00:00 2001
From: yuluyao <wushenggoo@gmail.com>
Date: Fri, 30 Aug 2019 10:05:30 +0800
Subject: [PATCH] 011

---
 build.gradle            |  1 -
 settings.gradle         |  8 +++---
 supportLib/build.gradle | 51 ++++++++++++++++++++---------------
 xLib/build.gradle       | 60 +++++++++++++++++++++++------------------
 4 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0d0069b..fab82f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/settings.gradle b/settings.gradle
index d256347..e5b8e45 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
-include ':supportLib',
-        ':supportSample',
-//include ':xLib',
-//        ':xSample'
+//include ':supportLib',
+//        ':supportSample',
+include ':xLib',
+        ':xSample'
 
 rootProject.name = 'frog'
\ No newline at end of file
diff --git a/supportLib/build.gradle b/supportLib/build.gradle
index b9e52b9..0aa0742 100644
--- a/supportLib/build.gradle
+++ b/supportLib/build.gradle
@@ -1,9 +1,10 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.yuluyao'
 
+
+
 android {
   compileSdkVersion 28
 
@@ -35,27 +36,33 @@ dependencies {
 //  compileOnly "com.android.support:support-v4:$versions.supportLib"
 }
 
-task sourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.sourceFiles
-}
-
-task javadoc(type: Javadoc) {
-  source = android.sourceSets.main.java.sourceFiles
-  classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
-  from javadoc.destinationDir
-}
+ext{
+  mavProjectName = 'Frog'
 
-task classesJar(type: Jar) {
-  from "$buildDir/intermediates/classes/release"
 }
+apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/1.0.4/gradle-mavenizer.gradle"
 
-artifacts {
-  archives classesJar
-  archives javadocJar
-  archives sourcesJar
-}
\ No newline at end of file
+//task sourcesJar(type: Jar) {
+//  classifier = 'sources'
+//  from android.sourceSets.main.java.sourceFiles
+//}
+//
+//task javadoc(type: Javadoc) {
+//  source = android.sourceSets.main.java.sourceFiles
+//  classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+//}
+//
+//task javadocJar(type: Jar, dependsOn: javadoc) {
+//  classifier = 'javadoc'
+//  from javadoc.destinationDir
+//}
+//
+//task classesJar(type: Jar) {
+//  from "$buildDir/intermediates/classes/release"
+//}
+//
+//artifacts {
+//  archives classesJar
+//  archives javadocJar
+//  archives sourcesJar
+//}
\ No newline at end of file
diff --git a/xLib/build.gradle b/xLib/build.gradle
index 99f0432..cea042c 100644
--- a/xLib/build.gradle
+++ b/xLib/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.yuluyao'
 
 android {
@@ -34,34 +33,43 @@ dependencies {
   compileOnly "com.google.android.material:material:$material_version"
 }
 
-task sourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.sourceFiles
-}
+ext{
+  mavProjectName = 'FrogX'
 
-task javadoc(type: Javadoc) {
-  source = android.sourceSets.main.java.sourceFiles
-  classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
+apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/1.0.4/gradle-mavenizer.gradle"
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
-  from javadoc.destinationDir
-}
 
-task classesJar(type: Jar) {
-  from "$buildDir/intermediates/classes/release"
-}
 
-artifacts {
-  archives classesJar
-  archives javadocJar
-  archives sourcesJar
-}
 
-repositories {
-  mavenCentral()
-  jcenter()
-  google()
-  maven { url "https://jitpack.io" }
-}
+//task sourcesJar(type: Jar) {
+//  classifier = 'sources'
+//  from android.sourceSets.main.java.sourceFiles
+//}
+//
+//task javadoc(type: Javadoc) {
+//  source = android.sourceSets.main.java.sourceFiles
+//  classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+//}
+//
+//task javadocJar(type: Jar, dependsOn: javadoc) {
+//  classifier = 'javadoc'
+//  from javadoc.destinationDir
+//}
+//
+//task classesJar(type: Jar) {
+//  from "$buildDir/intermediates/classes/release"
+//}
+//
+//artifacts {
+//  archives classesJar
+//  archives javadocJar
+//  archives sourcesJar
+//}
+//
+//repositories {
+//  mavenCentral()
+//  jcenter()
+//  google()
+//  maven { url "https://jitpack.io" }
+//}