From a7c27048e42d3f93330ba16eb9a5920a8c7543d8 Mon Sep 17 00:00:00 2001
From: Mykola Dzyuba <7852483+mdzyuba@users.noreply.github.com>
Date: Sat, 21 May 2022 14:21:05 -0700
Subject: [PATCH] Gradle plugin update to 7.2
Updated gradle plugin and dependencies.
Updated the target SDK.
Fixed a lint error.
Fixed javadoc classpath error.
---
.idea/runConfigurations/MPChartExample.xml | 19 +++++++++++++------
MPChartExample/build.gradle | 8 ++++----
MPChartExample/src/main/AndroidManifest.xml | 3 ++-
.../mpchartexample/notimportant/DemoBase.java | 1 +
MPChartLib/build.gradle | 17 ++++++-----------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
7 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/.idea/runConfigurations/MPChartExample.xml b/.idea/runConfigurations/MPChartExample.xml
index e6bcf50331..54250d5c6d 100644
--- a/.idea/runConfigurations/MPChartExample.xml
+++ b/.idea/runConfigurations/MPChartExample.xml
@@ -1,10 +1,13 @@
-
+
+
+
+
@@ -12,11 +15,8 @@
+
-
-
-
-
@@ -42,11 +42,18 @@
+
+
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
index 2d607e9991..0e2e254dd0 100644
--- a/MPChartExample/build.gradle
+++ b/MPChartExample/build.gradle
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 28
+ compileSdkVersion 32
defaultConfig {
applicationId "com.xxmassdeveloper.mpchartexample"
minSdkVersion 16
- targetSdkVersion 28
+ targetSdkVersion 32
versionCode 57
versionName '3.1.0'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -20,7 +20,7 @@ android {
}
dependencies {
- implementation "androidx.appcompat:appcompat:1.0.2"
- implementation 'com.google.android.material:material:1.0.0'
+ implementation "androidx.appcompat:appcompat:1.4.1"
+ implementation 'com.google.android.material:material:1.6.0'
implementation project(':MPChartLib')
}
diff --git a/MPChartExample/src/main/AndroidManifest.xml b/MPChartExample/src/main/AndroidManifest.xml
index 99334e601a..b7ba3e5f52 100644
--- a/MPChartExample/src/main/AndroidManifest.xml
+++ b/MPChartExample/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
android:theme="@style/AppTheme">
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java b/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java
index a963609aff..cdb75140e7 100644
--- a/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java
+++ b/MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.java
@@ -60,6 +60,7 @@ public void onBackPressed() {
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == PERMISSION_STORAGE) {
if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
saveToGallery();
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
index 0fb6dc7036..c8b5dc3420 100644
--- a/MPChartLib/build.gradle
+++ b/MPChartLib/build.gradle
@@ -1,16 +1,12 @@
apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
group='com.github.philjay'
android {
- compileSdkVersion 28
- buildToolsVersion '28.0.3'
+ compileSdkVersion 32
defaultConfig {
minSdkVersion 14
- targetSdkVersion 28
- versionCode 3
- versionName '3.1.0'
+ targetSdkVersion 32
}
buildTypes {
release {
@@ -24,24 +20,23 @@ android {
}
dependencies {
- implementation 'androidx.annotation:annotation:1.0.0'
- testImplementation 'junit:junit:4.12'
+ implementation 'androidx.annotation:annotation:1.3.0'
+ testImplementation 'junit:junit:4.13.2'
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
+ archiveClassifier = 'sources'
}
task javadoc(type: Javadoc) {
options.charSet = 'UTF-8'
failOnError false
source = android.sourceSets.main.java.sourceFiles
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}
task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
+ archiveClassifier = 'javadoc'
from javadoc.destinationDir
}
diff --git a/build.gradle b/build.gradle
index cee7a83e80..a8425b8839 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.0'
+ classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f8bc4e375..41ab1a41e6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip