From ee6495d30e4d7211402f2254e23c3d400665594e Mon Sep 17 00:00:00 2001 From: hefengbao <754582231@qq.com> Date: Sat, 8 Jun 2024 13:03:53 +0800 Subject: [PATCH] v1.11.0 --- app/build.gradle.kts | 6 ++-- app/proguard-rules.pro | 67 ++++++++++++++++++++++++++++++++++++++- gradle/libs.versions.toml | 8 ++--- 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6ef5ec4..b98b5d1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,8 +27,8 @@ android { applicationId = "com.hefengbao.jingmo" minSdk = 26 targetSdk = 34 - versionCode = 12 - versionName = "1.10.0" + versionCode = 13 + versionName = "1.11.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -98,7 +98,7 @@ android { } composeOptions { // 参考 https://developer.android.google.cn/jetpack/androidx/releases/compose-kotlin - kotlinCompilerExtensionVersion = "1.5.10" + kotlinCompilerExtensionVersion = "1.5.14" } packaging { resources { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index bb3f835..d350228 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -82,4 +82,69 @@ -dontwarn org.conscrypt.ConscryptHostnameVerifier -dontwarn org.openjsse.javax.net.ssl.SSLParameters -dontwarn org.openjsse.javax.net.ssl.SSLSocket --dontwarn org.openjsse.net.ssl.OpenJSSE \ No newline at end of file +-dontwarn org.openjsse.net.ssl.OpenJSSE + + + +-dontwarn com.chenlb.mmseg4j.ComplexSeg +-dontwarn com.chenlb.mmseg4j.Dictionary +-dontwarn com.chenlb.mmseg4j.MMSeg +-dontwarn com.chenlb.mmseg4j.Seg +-dontwarn com.github.houbb.pinyin.constant.enums.PinyinStyleEnum +-dontwarn com.github.promeg.pinyinhelper.Pinyin$Config +-dontwarn com.github.promeg.pinyinhelper.Pinyin +-dontwarn com.github.stuxuhai.jpinyin.PinyinFormat +-dontwarn com.googlecode.aviator.AviatorEvaluator +-dontwarn com.googlecode.aviator.AviatorEvaluatorInstance +-dontwarn com.hankcs.hanlp.HanLP +-dontwarn com.hankcs.hanlp.seg.Segment +-dontwarn com.huaban.analysis.jieba.JiebaSegmenter$SegMode +-dontwarn com.huaban.analysis.jieba.JiebaSegmenter +-dontwarn com.jfirer.jfireel.expression.Expression +-dontwarn com.mayabot.nlp.segment.Lexer +-dontwarn com.mayabot.nlp.segment.Lexers +-dontwarn com.ql.util.express.ExpressRunner +-dontwarn com.rnkrsoft.bopomofo4j.Bopomofo4j +-dontwarn io.github.logtube.Logtube +-dontwarn io.github.logtube.core.IEventLogger +-dontwarn net.sourceforge.pinyin4j.format.HanyuPinyinCaseType +-dontwarn net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat +-dontwarn net.sourceforge.pinyin4j.format.HanyuPinyinToneType +-dontwarn net.sourceforge.pinyin4j.format.HanyuPinyinVCharType +-dontwarn org.ansj.splitWord.Analysis +-dontwarn org.ansj.splitWord.analysis.ToAnalysis +-dontwarn org.apache.commons.jexl3.JexlBuilder +-dontwarn org.apache.commons.jexl3.JexlEngine +-dontwarn org.apache.log4j.Logger +-dontwarn org.apache.logging.log4j.LogManager +-dontwarn org.apache.logging.log4j.Logger +-dontwarn org.apache.lucene.analysis.Analyzer +-dontwarn org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer +-dontwarn org.apdplat.word.segmentation.Segmentation +-dontwarn org.apdplat.word.segmentation.SegmentationAlgorithm +-dontwarn org.apdplat.word.segmentation.SegmentationFactory +-dontwarn org.jboss.logging.Logger +-dontwarn org.lionsoul.jcseg.ISegment$Type +-dontwarn org.lionsoul.jcseg.ISegment +-dontwarn org.lionsoul.jcseg.dic.ADictionary +-dontwarn org.lionsoul.jcseg.dic.DictionaryFactory +-dontwarn org.lionsoul.jcseg.fi.SegmenterFunction +-dontwarn org.lionsoul.jcseg.segmenter.SegmenterConfig +-dontwarn org.mozilla.javascript.Context +-dontwarn org.mvel2.MVEL +-dontwarn org.pmw.tinylog.Level +-dontwarn org.pmw.tinylog.Logger +-dontwarn org.slf4j.ILoggerFactory +-dontwarn org.slf4j.Logger +-dontwarn org.slf4j.LoggerFactory +-dontwarn org.slf4j.helpers.NOPLoggerFactory +-dontwarn org.slf4j.spi.LocationAwareLogger +-dontwarn org.springframework.expression.ExpressionParser +-dontwarn org.springframework.expression.spel.standard.SpelExpressionParser +-dontwarn org.tinylog.Level +-dontwarn org.tinylog.Logger +-dontwarn org.tinylog.configuration.Configuration +-dontwarn org.tinylog.format.AdvancedMessageFormatter +-dontwarn org.tinylog.format.MessageFormatter +-dontwarn org.tinylog.provider.LoggingProvider +-dontwarn org.tinylog.provider.ProviderRegistry \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f479676..7c746c5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,17 +13,17 @@ bugly = "4.1.9.3" capturable = "2.0.0" coil = "2.6.0" compose-bom = "2024.01.00" -core-ktx = "1.10.1" +core-ktx = "1.12.0" espresso-core = "3.5.1" hilt = "2.50" hiltExt = "1.0.0" hutool = "5.8.27" junit = "4.13.2" -kotlin = "1.9.22" -kotlinxCoroutines = "1.6.4" +kotlin = "1.9.24" +kotlinxCoroutines = "1.7.3" kotlinxDatetime = "0.4.0" kotlinxSerializationJson = "1.6.3" -ksp = "1.9.0-1.0.13" +ksp = "1.9.24-1.0.20" lifecycle-runtime-ktx = "2.6.1" okhttp = "4.12.0" org-jetbrains-kotlin-android = "1.8.10"