From a67138a9bb457cb50a2272d808ce00ccb3c465cd Mon Sep 17 00:00:00 2001
From: lixiaojun <16167479@qq.com>
Date: Thu, 6 May 2021 21:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0jitpack?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  6 +++++
 .idea/gradle.xml                              |  1 +
 .idea/jarRepositories.xml                     | 10 ++++++++
 .idea/misc.xml                                |  2 +-
 .idea/runConfigurations.xml                   |  1 +
 README.md                                     |  4 +--
 app/build.gradle                              |  3 +--
 .../com/lxj/xpopupextdemo/MainActivity.java   |  5 ++--
 build.gradle                                  |  9 +++----
 ext/build.gradle                              | 25 +++++++++----------
 .../lxj/xpopupext/popup/TimePickerPopup.java  |  2 +-
 settings.gradle                               |  2 +-
 12 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 .idea/compiler.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1ca1297..aae808f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/ext" />
+            <option value="$PROJECT_DIR$/wheelview" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 97c1d11..6f7b283 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,15 @@
       <option name="name" value="maven" />
       <option name="url" value="https://dl.bintray.com/li-xiaojun/jrepo" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..4700283 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/README.md b/README.md
index cfda2df..39c54ce 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ XPopupExt是XPopup的扩展功能库，由于对PickerView自身的UI和交互
 ```
 implementation 'com.lxj:xpopup-ext:最新版本'
 //由于扩展库依赖XPopup才能正常使用，所以还必须添加XPopup依赖
-implementation 'com.lxj:xpopup:2.0.2'
+implementation 'com.github.li-xiaojun:XPopup:2.2.25'
 ```
 
 - 时间选择器TimerPickerPopup弹窗，使用示例:
@@ -22,7 +22,7 @@ date2.set(2020, 5,1);
 TimePickerPopup popup = new TimePickerPopup(MainActivity.this)
 //                        .setDefaultDate(date)  //设置默认选中日期
 //                        .setYearRange(1990, 1999) //设置年份范围
-//                        .setDateRang(date, date2) //设置日期范围
+//                        .setDateRange(date, date2) //设置日期范围
         .setTimePickerListener(new TimePickerListener() {
             @Override
             public void onTimeChanged(Date date) {
diff --git a/app/build.gradle b/app/build.gradle
index 4764146..f08e465 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,6 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.lxj:xpopup:2.0.2'       //弹窗
+    implementation 'com.github.li-xiaojun:XPopup:2.2.25'
     implementation project(":ext")
-//    implementation 'com.lxj:xpopup-ext:0.0.3'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java b/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java
index 567ed79..5bf967f 100644
--- a/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java
+++ b/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java
@@ -6,7 +6,6 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
-
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopupext.listener.CityPickerListener;
 import com.lxj.xpopupext.listener.TimePickerListener;
@@ -32,9 +31,9 @@ public void onClick(View view) {
                 date2.set(2020, 5,1);
                 TimePickerPopup popup = new TimePickerPopup(MainActivity.this)
 //                        .setMode(TimePickerPopup.Mode.YMDHMS)
-//                        .setDefaultDate(date)  //设置默认选中日期
+                        .setDefaultDate(date)  //设置默认选中日期
 //                        .setYearRange(1990, 1999) //设置年份范围
-//                        .setDateRang(date, date2) //设置日期范围
+                        .setDateRange(date, date2) //设置日期范围
                         .setTimePickerListener(new TimePickerListener() {
                             @Override
                             public void onTimeChanged(Date date) {
diff --git a/build.gradle b/build.gradle
index 5f78677..82303e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,21 +2,18 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:3.5.3"
-        classpath 'com.novoda:bintray-release:0.9.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 
diff --git a/ext/build.gradle b/ext/build.gradle
index 53d3313..a1ecbd2 100644
--- a/ext/build.gradle
+++ b/ext/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion 29
@@ -23,16 +22,16 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.lxj:xpopup:2.2.12'               //弹窗
-//    api project(':wheelview')
-    implementation 'com.contrarywind:wheelview:4.1.0'
-}
-publish {
-    userOrg = 'li-xiaojun'
-    groupId = 'com.lxj'
-    artifactId = 'xpopup-ext'
-    publishVersion = '0.0.4'
-    repoName = 'jrepo'
-    desc = 'XPopup扩展功能库'
-    website = 'https://github.com/li-xiaojun/XPopupExt'
+    implementation 'com.github.li-xiaojun:XPopup:2.2.25'
+//    implementation 'com.contrarywind:wheelview:4.1.0'
+    implementation project(":wheelview")
 }
+//publish {
+//    userOrg = 'li-xiaojun'
+//    groupId = 'com.lxj'
+//    artifactId = 'xpopup-ext'
+//    publishVersion = '0.0.4'
+//    repoName = 'jrepo'
+//    desc = 'XPopup扩展功能库'
+//    website = 'https://github.com/li-xiaojun/XPopupExt'
+//}
diff --git a/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java b/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java
index 0719c9d..1ebc58b 100644
--- a/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java
+++ b/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java
@@ -204,7 +204,7 @@ public TimePickerPopup setYearRange(int startYear, int endYear) {
     /**
      * 设置可以选择的时间范围
      */
-    public TimePickerPopup setDateRang(Calendar startDate, Calendar endDate) {
+    public TimePickerPopup setDateRange(Calendar startDate, Calendar endDate) {
         this.startDate = startDate;
         this.endDate = endDate;
         return this;
diff --git a/settings.gradle b/settings.gradle
index 831dade..b97f49f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 include ':ext'
 include ':app'
-//include ':wheelview'
+include ':wheelview'
 rootProject.name = "XPopupExt"
\ No newline at end of file