From 4788605b466643e97c1598521638a95d74a7fdd1 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 17 Jan 2024 17:50:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8D=87=E7=BA=A7Gradle=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=88=B07.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nnbc123/app/audio/helper/SvgaCacheManager.java   | 2 +-
 .../java/com/nnbc123/app/avroom/widget/GiftEffectView.java    | 2 +-
 .../main/java/com/nnbc123/app/avroom/widget/GiftV2View.java   | 2 +-
 build.gradle                                                  | 4 ++--
 .../main/java/com/nnbc123/core/family/bean/HomeTitleInfo.java | 2 +-
 .../main/java/com/nnbc123/core/radish/signin/SignInModel.java | 3 ++-
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/nnbc123/app/audio/helper/SvgaCacheManager.java b/app/src/main/java/com/nnbc123/app/audio/helper/SvgaCacheManager.java
index 9a98c9220..0185b4ec9 100644
--- a/app/src/main/java/com/nnbc123/app/audio/helper/SvgaCacheManager.java
+++ b/app/src/main/java/com/nnbc123/app/audio/helper/SvgaCacheManager.java
@@ -11,7 +11,7 @@ import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 
 
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import io.reactivex.Single;
 import io.reactivex.SingleOnSubscribe;
diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
index 4dfb2b668..b47767490 100644
--- a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java
@@ -47,7 +47,7 @@ import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * @author chenran
diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftV2View.java b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftV2View.java
index e578d1afb..418efedca 100644
--- a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftV2View.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftV2View.java
@@ -70,7 +70,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Random;
 
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 
 /**
diff --git a/build.gradle b/build.gradle
index fb87e8e16..4282b2513 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         //realm 数据库插件
-        classpath "io.realm:realm-gradle-plugin:5.3.0"
+        classpath "io.realm:realm-gradle-plugin:10.16.1"
         // android 资源混淆插件
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 //        classpath 'com.tencent.vasdolly:plugin:3.0.3'
diff --git a/core/src/main/java/com/nnbc123/core/family/bean/HomeTitleInfo.java b/core/src/main/java/com/nnbc123/core/family/bean/HomeTitleInfo.java
index ee3b1f1fe..565d4dfba 100644
--- a/core/src/main/java/com/nnbc123/core/family/bean/HomeTitleInfo.java
+++ b/core/src/main/java/com/nnbc123/core/family/bean/HomeTitleInfo.java
@@ -2,7 +2,7 @@ package com.nnbc123.core.family.bean;
 
 import com.nnbc123.core.utils.SharedPreferenceUtils;
 import java.util.List;
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * 首页的标题
diff --git a/core/src/main/java/com/nnbc123/core/radish/signin/SignInModel.java b/core/src/main/java/com/nnbc123/core/radish/signin/SignInModel.java
index aeec93b12..baae74ec1 100644
--- a/core/src/main/java/com/nnbc123/core/radish/signin/SignInModel.java
+++ b/core/src/main/java/com/nnbc123/core/radish/signin/SignInModel.java
@@ -2,6 +2,8 @@ package com.nnbc123.core.radish.signin;
 
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.nnbc123.core.BuildConfig;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.base.BaseModel;
@@ -23,7 +25,6 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
 
 import io.reactivex.Single;
 import io.reactivex.SingleSource;
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ce82f0055..c1218eca3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Apr 03 18:35:35 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME