浏览代码

Update dependencies

世界 4 年之前
父节点
当前提交
512b10317d
共有 7 个文件被更改,包括 7 次插入54 次删除
  1. 0 48
      .idea/gradle.xml
  2. 2 2
      app/build.gradle.kts
  3. 1 0
      build.gradle.kts
  4. 1 1
      buildSrc/src/main/kotlin/Helpers.kt
  5. 1 1
      external/editorkit
  6. 1 1
      external/preferencex
  7. 1 1
      repositories.gradle.kts

+ 0 - 48
.idea/gradle.xml

@@ -10,44 +10,20 @@
               <build path="$PROJECT_DIR$/external/editorkit" name="editorkit">
                 <projects>
                   <project path="$PROJECT_DIR$/external/editorkit" />
-                  <project path="$PROJECT_DIR$/external/editorkit/app" />
                   <project path="$PROJECT_DIR$/external/editorkit/data" />
                   <project path="$PROJECT_DIR$/external/editorkit/domain" />
                   <project path="$PROJECT_DIR$/external/editorkit/editorkit" />
                   <project path="$PROJECT_DIR$/external/editorkit/features" />
                   <project path="$PROJECT_DIR$/external/editorkit/features/feature-editor" />
-                  <project path="$PROJECT_DIR$/external/editorkit/features/feature-explorer" />
-                  <project path="$PROJECT_DIR$/external/editorkit/features/feature-fonts" />
-                  <project path="$PROJECT_DIR$/external/editorkit/features/feature-settings" />
-                  <project path="$PROJECT_DIR$/external/editorkit/features/feature-themes" />
                   <project path="$PROJECT_DIR$/external/editorkit/features/feature-ui" />
                   <project path="$PROJECT_DIR$/external/editorkit/features/feature-utils" />
                   <project path="$PROJECT_DIR$/external/editorkit/filesystems" />
                   <project path="$PROJECT_DIR$/external/editorkit/filesystems/filesystem-base" />
                   <project path="$PROJECT_DIR$/external/editorkit/filesystems/filesystem-local" />
                   <project path="$PROJECT_DIR$/external/editorkit/languages" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-actionscript" />
                   <project path="$PROJECT_DIR$/external/editorkit/languages/language-base" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-c" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-cpp" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-csharp" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-groovy" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-html" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-java" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-javascript" />
                   <project path="$PROJECT_DIR$/external/editorkit/languages/language-json" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-kotlin" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-lisp" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-lua" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-markdown" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-php" />
                   <project path="$PROJECT_DIR$/external/editorkit/languages/language-plaintext" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-python" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-shell" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-sql" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-typescript" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-visualbasic" />
-                  <project path="$PROJECT_DIR$/external/editorkit/languages/language-xml" />
                 </projects>
               </build>
             </builds>
@@ -66,44 +42,20 @@
             <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/external" />
             <option value="$PROJECT_DIR$/external/editorkit" />
-            <option value="$PROJECT_DIR$/external/editorkit/app" />
             <option value="$PROJECT_DIR$/external/editorkit/data" />
             <option value="$PROJECT_DIR$/external/editorkit/domain" />
             <option value="$PROJECT_DIR$/external/editorkit/editorkit" />
             <option value="$PROJECT_DIR$/external/editorkit/features" />
             <option value="$PROJECT_DIR$/external/editorkit/features/feature-editor" />
-            <option value="$PROJECT_DIR$/external/editorkit/features/feature-explorer" />
-            <option value="$PROJECT_DIR$/external/editorkit/features/feature-fonts" />
-            <option value="$PROJECT_DIR$/external/editorkit/features/feature-settings" />
-            <option value="$PROJECT_DIR$/external/editorkit/features/feature-themes" />
             <option value="$PROJECT_DIR$/external/editorkit/features/feature-ui" />
             <option value="$PROJECT_DIR$/external/editorkit/features/feature-utils" />
             <option value="$PROJECT_DIR$/external/editorkit/filesystems" />
             <option value="$PROJECT_DIR$/external/editorkit/filesystems/filesystem-base" />
             <option value="$PROJECT_DIR$/external/editorkit/filesystems/filesystem-local" />
             <option value="$PROJECT_DIR$/external/editorkit/languages" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-actionscript" />
             <option value="$PROJECT_DIR$/external/editorkit/languages/language-base" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-c" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-cpp" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-csharp" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-groovy" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-html" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-java" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-javascript" />
             <option value="$PROJECT_DIR$/external/editorkit/languages/language-json" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-kotlin" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-lisp" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-lua" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-markdown" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-php" />
             <option value="$PROJECT_DIR$/external/editorkit/languages/language-plaintext" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-python" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-shell" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-sql" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-typescript" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-visualbasic" />
-            <option value="$PROJECT_DIR$/external/editorkit/languages/language-xml" />
             <option value="$PROJECT_DIR$/external/preferencex" />
             <option value="$PROJECT_DIR$/external/preferencex/colorpicker" />
             <option value="$PROJECT_DIR$/external/preferencex/flexbox" />

+ 2 - 2
app/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     implementation(fileTree("libs"))
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
-    implementation("androidx.core:core-ktx:1.5.0")
+    implementation("androidx.core:core-ktx:1.6.0")
     implementation("androidx.activity:activity-ktx:1.2.3")
     implementation("androidx.fragment:fragment-ktx:1.3.5")
     implementation("androidx.browser:browser:1.3.0")
@@ -47,7 +47,7 @@ dependencies {
     implementation(project(":external:preferencex:preferencex-simplemenu"))
     implementation(project(":external:preferencex:preferencex-colorpicker"))
 
-    implementation("com.google.android.material:material:1.3.0")
+    implementation("com.google.android.material:material:1.4.0")
     implementation("cn.hutool:hutool-core:5.7.3")
     implementation("cn.hutool:hutool-json:5.7.3")
     implementation("cn.hutool:hutool-crypto:5.7.3")

+ 1 - 0
build.gradle.kts

@@ -36,6 +36,7 @@ allprojects {
         resolutionStrategy {
             componentSelection {
                 all {
+
                     val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea")
                         .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
                         .any { it.matches(candidate.version) }

+ 1 - 1
buildSrc/src/main/kotlin/Helpers.kt

@@ -484,7 +484,7 @@ fun Project.setupApp() {
         add("implementation", project(":plugin:api"))
         add("testImplementation", "junit:junit:4.13.2")
         add("androidTestImplementation", "androidx.test.ext:junit:1.1.2")
-        add("androidTestImplementation", "androidx.test:runner:1.3.0")
+        add("androidTestImplementation", "androidx.test:runner:1.4.0")
         add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.3.0")
 
         if (targetAbi.isNotBlank()) {

+ 1 - 1
external/editorkit

@@ -1 +1 @@
-Subproject commit e84acf685ae51712a0b5e98ee5c4aab174664413
+Subproject commit b55c6ce5d229c0fb0c96c217a6bc19b5b16d448c

+ 1 - 1
external/preferencex

@@ -1 +1 @@
-Subproject commit ea46ecf484beb26d1a61bdad1052b78192505047
+Subproject commit f6f92c79c5a261d101d43567428aa9ab42983936

+ 1 - 1
repositories.gradle.kts

@@ -1,5 +1,5 @@
 rootProject.extra.apply {
-    set("androidPluginVersion", "4.2.1")
+    set("androidPluginVersion", "4.2.2")
     set("kotlinVersion", "1.5.20")
     set("playPublisherVersion", "3.5.0")
 }