From e34451ea478cef389f4bcf7438ca01c507e0f94c Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Thu, 7 Apr 2022 17:16:22 +0800
Subject: [PATCH] Remove shortcuts.xml and Android-Plugin-Framework

---
 .idea/jarRepositories.xml              |  5 +++++
 app/build.gradle                       | 19 ++-----------------
 app/src/main/AndroidManifest.xml       |  6 ------
 app/src/main/res/xml-v25/shortcuts.xml | 16 ----------------
 build.gradle                           |  3 +--
 5 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/res/xml-v25/shortcuts.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e34606c..4dcbce1 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <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/app/build.gradle b/app/build.gradle
index ef0cfd1..ac9d964 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,8 +2,6 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
 }
-//插件脚本
-//apply from: "https://raw.githubusercontent.com/limpoxe/Android-Plugin-Framework/master/FairyPlugin/host.gradle"
 
 android {
     compileSdk 31
@@ -40,24 +38,11 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
     implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
 
     implementation 'com.google.code.gson:gson:2.9.0'
-//    请务必使用@aar结尾，以中断依赖传递
-//    implementation('com.github.limpoxe:Android-Plugin-Framework:0.0.72@aar')
-//    可选，用于支持插件全局函数式服务，不使用全局函数式服务不需要添加此依赖
-//    implementation('com.limpoxe.support:android-servicemanager:1.0.5@aar')
 }
-
-/*
-fairy {
-    //可选配置，用于指定插件进程名。默认插件进程为单独的进程，进程名为":plugin"
-    //若设置为空串或者null即是使用宿主进程作为插件进程
-    //pluginProcess = ""
-    //pluginProcess = null
-    //pluginProcess = ":xxx"
-}*/
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 32e948b..66ca475 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,12 +30,6 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
-<!--
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
--->
         </activity>
         <activity
             android:name=".tools.TimeScreenActivity"
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
deleted file mode 100644
index 5024992..0000000
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-    <shortcut
-        android:enabled="true"
-        android:icon="@mipmap/ic_launcher_round"
-        android:shortcutDisabledMessage="@string/shortcutDisabledMessage"
-        android:shortcutId="main"
-        android:shortcutLongLabel="@string/shortcutLongLabel"
-        android:shortcutShortLabel="@string/shortcutShortLabel">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="com.fatapp.oxygentoolbox.MainActivity"
-            android:targetPackage="com.fatapp.oxygentoolbox" />
-        <categories android:name="android.shortcut.conversation" />
-    </shortcut>
-</shortcuts>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index efa1b41..03ba1a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +18,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-//        maven { url 'https://jitpack.io' }
     }
 }