chore: update

itning · Mar 25, 2023 · 02f8251 · 02f8251
1 parent d43ada8
commit 02f8251
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "top.itning.getupearly"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 11
-        versionName "1.3.6"
+        versionCode 12
+        versionName "1.3.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs 'zh', 'en'
     }
@@ -28,6 +28,8 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+    namespace 'top.itning.getupearly'
 }
 
 dependencies {
@@ -37,9 +39,9 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.3.0"
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
+    implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="top.itning.getupearly">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/app/src/main/java/top/itning/getupearly/MainActivity.java b/app/src/main/java/top/itning/getupearly/MainActivity.java
@@ -13,9 +13,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import top.itning.getupearly.config.SharedPreferencesConfig;
 import top.itning.getupearly.factory.ViewFactory;
 import top.itning.getupearly.net.HttpHelper;

diff --git a/app/src/main/java/top/itning/getupearly/net/HttpHelper.java b/app/src/main/java/top/itning/getupearly/net/HttpHelper.java
@@ -6,7 +6,7 @@
 
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -30,7 +30,7 @@ public static void initRetrofit() {
                 .build();
         RETROFIT = new Retrofit.Builder()
                 .baseUrl(baseUrl)
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .addConverterFactory(GsonConverterFactory.create())
                 .client(okHttpClient)
                 .build();

diff --git a/app/src/main/java/top/itning/getupearly/net/NetInfo.java b/app/src/main/java/top/itning/getupearly/net/NetInfo.java
@@ -1,6 +1,6 @@
 package top.itning.getupearly.net;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
 import top.itning.getupearly.entity.UpdateInfo;
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,2 +1,2 @@
-#Wed May 18 20:48:32 CST 2022
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+#Sat Mar 25 15:38:04 CST 2023
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip