Updating to v20 -- Changes to required permissions and the Android minSDK (now >= 26) to support more devices

maxieds · maxieds · commit ebeba643087e · 2022-07-16T18:06:06.000-04:00
diff --git a/AndroidFilePickerLightLibrary/build.gradle b/AndroidFilePickerLightLibrary/build.gradle
@@ -4,39 +4,50 @@ import java.text.DateFormat
 import java.text.SimpleDateFormat
 
 def getDateTimestamp() {
-    DateFormat df = new SimpleDateFormat("YYYY-MM-dd-HHmmss");
-    return new String(df.format(new Date()).toString());
+
+    DateFormat df = new SimpleDateFormat("YYYY-MM-dd-HHmmss")
+    return new String(df.format(new Date()).toString())
+
 }
 
 def getShellCommandOutput(String shellCmd) {
-    def cmdResult = ['bash', '-c', shellCmd].execute();
-    cmdResult.waitFor();
-    return cmdResult.text[0..-2];
+
+    def cmdResult = ['bash', '-c', shellCmd].execute()
+    cmdResult.waitFor()
+    return cmdResult.text[0..-2]
+
 }
 
 def getGitCommitHash() {
-    return getShellCommandOutput("git show | head -n 1 | sed -e \"s/commit //\" | cut -c-12");
+
+    return getShellCommandOutput("git show | head -n 1 | sed -e \"s/commit //\" | cut -c-12")
+
 }
 
 def getGitCommitDate() {
-    return getShellCommandOutput("git show | grep Date: | head -n 1 | sed -e \"s/Date:[ ]*//\"");
+
+    return getShellCommandOutput("git show | grep Date: | head -n 1 | sed -e \"s/Date:[ ]*//\"")
+
 }
 
 android {
 
-    compileSdkVersion 30
-    buildToolsVersion "30.0.1"
-
     defaultConfig {
-        minSdkVersion 29
+
+        minSdkVersion 26
         targetSdkVersion 30
-        versionCode 18
-        versionName "1.1.7"
+        compileSdkVersion 31
+        versionCode 20
+        versionName "1.1.9"
+        buildToolsVersion "30.0.1"
+
     }
 
     compileOptions {
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+
     }
 
     buildTypes {
@@ -45,6 +56,29 @@ android {
 
             minifyEnabled false
 
+            buildConfigField "long", "VERSION_CODE", "${android.defaultConfig.versionCode}"
+            buildConfigField "String", "VERSION_NAME", "\"${android.defaultConfig.versionName}\""
+
+            buildConfigField "String", "BUILD_TIMESTAMP", "\"" + getDateTimestamp() + "\""
+            buildConfigField "String", "GIT_COMMIT_HASH", "\"" + getGitCommitHash() + "\""
+            buildConfigField "String", "GIT_COMMIT_DATE", "\"" + getGitCommitDate() + "\""
+
+            manifestPlaceholders = [
+                    libraryIcon               : "@mipmap/library_profile_icon_round",
+                    libraryTheme              : "@style/LibraryDefaultTheme",
+                    libraryDebug              : "false",
+                    libraryInstallLocation    : "preferExternal"
+            ]
+
+        }
+
+        debug {
+
+            minifyEnabled false
+
+            buildConfigField "long", "VERSION_CODE", "${android.defaultConfig.versionCode}"
+            buildConfigField "String", "VERSION_NAME", "\"${android.defaultConfig.versionName}\""
+
             buildConfigField "String", "BUILD_TIMESTAMP", "\"" + getDateTimestamp() + "\""
             buildConfigField "String", "GIT_COMMIT_HASH", "\"" + getGitCommitHash() + "\""
             buildConfigField "String", "GIT_COMMIT_DATE", "\"" + getGitCommitDate() + "\""
@@ -55,23 +89,30 @@ android {
                     libraryDebug              : "false",
                     libraryInstallLocation    : "preferExternal"
             ]
+
         }
 
     }
 
 }
 
 repositories {
+
     maven {
+
         url "https://maven.google.com"
         name 'Google'
+
     }
+
 }
 
 dependencies {
+
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.android.support:recyclerview-v7:30.0.0'
     implementation 'org.apache.commons:commons-text:1.7'
     implementation 'pub.devrel:easypermissions:3.0.0'
+
 }
diff --git a/AndroidFilePickerLightLibrary/src/main/AndroidManifest.xml b/AndroidFilePickerLightLibrary/src/main/AndroidManifest.xml
@@ -21,9 +21,9 @@
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:required="true" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="true" />
-    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" android:required="false" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" android:required="true" />
     <!--<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" android:required="false" />-->
-    <uses-permission android:name="android.permission.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION" android:required="false" />
+    <!--<uses-permission android:name="android.permission.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION" android:required="false" />-->
     <uses-permission android:name="android.permission.INTERNET" android:required="false" />
 
     <application
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/BasicFileProvider.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/BasicFileProvider.java
@@ -17,6 +17,8 @@ This program (the AndroidFilePickerLight library) is free software written by
 
 package com.maxieds.androidfilepickerlightlibrary;
 
+import static java.util.Locale.ROOT;
+
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
@@ -32,29 +34,22 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
-import androidx.core.content.FileProvider;
-
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Locale;
 import java.util.PriorityQueue;
 import java.util.Set;
 
-import static java.util.Locale.ROOT;
-
 /*
  * Adapted from the source at:
  * https://github.com/android/storage-samples/tree/main/StorageProvider
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/CustomThemeBuilder.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/CustomThemeBuilder.java
@@ -23,7 +23,6 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.Window;
@@ -33,11 +32,11 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import androidx.appcompat.widget.Toolbar;
 
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.graphics.ColorUtils;
 
 import java.util.HashMap;
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayUtils.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayUtils.java
@@ -19,11 +19,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 
 import android.app.Activity;
 import android.graphics.Color;
-import android.graphics.LinearGradient;
 import android.graphics.PorterDuff;
-import android.graphics.RadialGradient;
-import android.graphics.Shader;
-import android.graphics.SweepGradient;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
@@ -37,7 +33,6 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java
@@ -20,7 +20,6 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -31,10 +30,8 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.Toolbar;
-
-import androidx.annotation.ColorInt;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -334,7 +331,7 @@ public void onNewIntent(Intent broadcastIntent) {
 
     public static final String[] ACTIVITY_OPTIONAL_PERMISSIONS = {
             "android.permission.INTERNET",
-            "android.permission.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION",
+            //"android.permission.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION",
             //"android.permission.MANAGE_EXTERNAL_STORAGE",
     };
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,33 +1,47 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.0"
 
     defaultConfig {
+
         applicationId "com.maxieds.androidfilepickerlight"
-        minSdkVersion 29
+        minSdkVersion 26
         targetSdkVersion 30
-        versionCode 1
+        compileSdkVersion 31
+        versionCode 2
         versionName "1.0"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
     }
 
     compileOptions {
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+
     }
 
     buildTypes {
+
         release {
+
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+        }
+
+        debug {
+
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
         }
+
     }
 }
 
 dependencies {
+
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git 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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath "com.android.tools.build:gradle:4.0.0"`
	`8`	`+ classpath 'com.android.tools.build:gradle:7.1.2'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`