Browse Source

修改maven地址,提交1.0.4版本

yanyi 3 years ago
parent
commit
337c1ad92e
6 changed files with 41 additions and 22 deletions
  1. 6 4
      README.md
  2. 3 3
      app/build.gradle
  3. 9 2
      build.gradle
  4. 18 6
      datelib/bintrayUpload.gradle
  5. 4 6
      datelib/build.gradle
  6. 1 1
      gradle/wrapper/gradle-wrapper.properties

+ 6 - 4
README.md

@@ -7,13 +7,14 @@
 ~~~
 repositories {
         maven {
-            url "http://maven.benyanyi.com/nexus/content/repositories/mylove/"
+            //allowInsecureProtocol = true//build:gradle版本4.1.3版本以上需添加
+            url "http://maven.keleyanyi.com/repository/benyanyi/"
         }
     }
 ~~~
 ### module 下添加
 ~~~
-implementation 'com.yanyi.benyanyi:DateSelect:1.0.3'
+implementation 'com.yanyi.benyanyi:DateSelect:1.0.4'
 ~~~
 
 或者
@@ -21,7 +22,7 @@ implementation 'com.yanyi.benyanyi:DateSelect:1.0.3'
 <dependency>
   <groupId>com.yanyi.benyanyi</groupId>
   <artifactId>DateSelect</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <type>aar</type>
 </dependency>
 ~~~
@@ -72,7 +73,8 @@ selectData.setDateClickListener(new SelectData.OnDateClickListener() {
 });
 ~~~
 ## 更新记录
-* 2021-13-14 提交1.0.3版本 删除开始时间和结束时间不能超过当前时间限制
+* 2021-08-27 提交1.0.4版本,修改maven地址
+* 2021-03-14 提交1.0.3版本 删除开始时间和结束时间不能超过当前时间限制
 * 2020-05-18 提交1.0.2版本,将android support转成androidx支持,并将Maven库存放到个人服务器上
 * 2019-06-12 提交1.0.1版本,优化一些已知细节,变更包名,开源库包名进行统一
 * 2018-06-09 提交1.0.0版本

+ 3 - 3
app/build.gradle

@@ -20,9 +20,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation project(':datelib')
 }

+ 9 - 2
build.gradle

@@ -5,10 +5,13 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'http://maven.yanyi.online:8081/nexus/content/repositories/mylove/' }
+        maven {
+//            allowInsecureProtocol = true
+            url 'http://maven.keleyanyi.com/repository/benyanyi/'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
 
@@ -25,6 +28,10 @@ allprojects {
             url 'http://www.idescout.com/maven/repo/'
             name 'IDEScout, Inc.'
         }
+        maven {
+//            allowInsecureProtocol = true
+            url 'http://maven.keleyanyi.com/repository/benyanyi/'
+        }
         //解决中文乱码问题
         tasks.withType(Javadoc) { //兼容中文
             options.addStringOption('Xdoclint:none', '-quiet')

+ 18 - 6
datelib/bintrayUpload.gradle

@@ -1,4 +1,3 @@
-apply plugin: 'maven-publish'
 apply plugin: 'maven'
 
 Properties properties = new Properties()
@@ -9,12 +8,25 @@ uploadArchives {
             repository(url: properties.getProperty("POM_URL")) {
                 authentication(userName: properties.getProperty("nexus.user"), password: properties.getProperty("nexus.password"))
             }
-
-            pom.groupId = properties.getProperty("POM_GROUP_ID")
-            pom.artifactId = properties.getProperty("POM_ATRIFACT_ID")
-            pom.version = properties.getProperty("POM_VERSION")
-
+//
+//            pom.groupId = properties.getProperty("POM_GROUP_ID")
+//            pom.artifactId = properties.getProperty("POM_ATRIFACT_ID")
+//            pom.version = properties.getProperty("POM_VERSION")
+//
+//            pom.project {
+//                licenses {
+//                    license {
+//                        name 'The Apache Software License, Version 2.0'
+//                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+//                    }
+//                }
+//            }
             pom.project {
+                version properties.getProperty("POM_VERSION")
+                artifactId properties.getProperty("POM_ATRIFACT_ID")
+                groupId properties.getProperty("POM_GROUP_ID")
+                packaging 'aar'
+                description properties.getProperty("POM_DESCRIPTION")
                 licenses {
                     license {
                         name 'The Apache Software License, Version 2.0'

+ 4 - 6
datelib/build.gradle

@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -27,9 +25,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
-apply from: 'bintrayUpload.gradle'
+apply from: './bintrayUpload.gradle'

+ 1 - 1
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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip