From 14f809d62f5c2b63ea49ac4be500b6f60cbc1080 Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Thu, 25 Mar 2021 21:30:39 +0800
Subject: [PATCH] [core] Update dependencies

---
 .../manager/ui/dialog/InfoDialogBuilder.java  | 32 ++++++++++++++-----
 build.gradle.kts                              |  2 +-
 core/build.gradle.kts                         |  2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java
index 3d82b07c..b031fe6a 100644
--- a/app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java
+++ b/app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java
@@ -65,14 +65,30 @@ public class InfoDialogBuilder extends BlurBehindDialogBuilder {
         setView(binding.getRoot());
 
         setPositiveButton(android.R.string.ok, null);
-        setNeutralButton(android.R.string.copy, (dialog, which) -> ClipboardUtils.put(context,
-                String.format(Locale.US, "%s\n%s\n\n%s\n%s\n\n%s\n%s\n\n%s\n%s\n\n%s\n%s\n\n%s\n%s",
-                        context.getString(R.string.info_api_version), binding.apiVersion.getText(),
-                        context.getString(R.string.info_framework_version), binding.frameworkVersion.getText(),
-                        context.getString(R.string.info_manager_version), binding.managerVersion.getText(),
-                        context.getString(R.string.info_system_version), binding.systemVersion.getText(),
-                        context.getString(R.string.info_device), binding.device.getText(),
-                        context.getString(R.string.info_system_abi), binding.systemAbi.getText())));
+        String info = context.getString(R.string.info_api_version) +
+                "\n" +
+                binding.apiVersion.getText() +
+                "\n\n" +
+                context.getString(R.string.info_framework_version) +
+                "\n" +
+                binding.frameworkVersion.getText() +
+                "\n\n" +
+                context.getString(R.string.info_manager_version) +
+                "\n" +
+                binding.managerVersion.getText() +
+                "\n\n" +
+                context.getString(R.string.info_system_version) +
+                "\n" +
+                binding.systemVersion.getText() +
+                "\n\n" +
+                context.getString(R.string.info_device) +
+                "\n" +
+                binding.device.getText() +
+                "\n\n" +
+                context.getString(R.string.info_system_abi) +
+                "\n" +
+                binding.systemAbi.getText();
+        setNeutralButton(android.R.string.copy, (dialog, which) -> ClipboardUtils.put(context, info));
     }
 
     private String getDevice() {
diff --git a/build.gradle.kts b/build.gradle.kts
index 99625ac2..aa92a72e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
         classpath("com.android.tools:r8:3.0.28-dev")
         classpath("com.android.tools.build:gradle:7.0.0-alpha11")
         classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r")
-        classpath(kotlin("gradle-plugin", version = "1.4.31"))
+        classpath(kotlin("gradle-plugin", version = "1.4.32"))
     }
 }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index c6be5611..c1bbcba2 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
     implementation(files("libs/dobby_prefab.aar"))
     implementation("com.android.tools.build:apksig:4.1.3")
     compileOnly(project(":hiddenapi-stubs"))
-    compileOnly("androidx.annotation:annotation:1.1.0")
+    compileOnly("androidx.annotation:annotation:1.2.0")
     implementation(project(":interface"))
     implementation(project(":hiddenapi-bridge"))
     implementation(project(":manager-service"))