Support Android 15.

Java 17
ticherhaz · Oct 29, 2024 · 947cb5c · 947cb5c
1 parent 059379e
commit 947cb5c
Show file tree

Hide file tree

Showing 45 changed files with 752 additions and 688 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,17 +1,19 @@
 apply plugin: 'com.android.application'
+
 apply plugin: 'kotlin-android'
-//apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 
 android {
-    compileSdkVersion 30
+    compileSdk 35
+    namespace 'vi.filepicker'
 
     defaultConfig {
         applicationId "vi.filepicker"
         minSdkVersion 23
-        targetSdkVersion 30
-        versionCode 13
-        versionName "1.3.0"
+        targetSdkVersion 35
+
+        versionCode 15
+        versionName "1.5.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -21,23 +23,20 @@ android {
         }
     }
 
-    /*buildFeatures {
+    buildFeatures {
         buildConfig = true
-        viewBinding = true
-    }
-    kotlin {
-        jvmToolchain {
-            JavaVersion.VERSION_1_8
-        }
-    }*/
-    /*compileOptions {
-        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_17
+    }
+    lint {
         checkReleaseBuilds false
-    }*/
+    }
 }
 
 dependencies {
@@ -47,19 +46,18 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation "com.github.xinyuez:easypermissions:2.0.1"
     implementation 'com.google.android.material:material:1.12.0'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
     // Required for instrumented tests
-    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.annotation:annotation:1.9.0'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
     // Optional -- UI testing with Espresso
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
-
-//    compile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="vi.filepicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
@@ -12,14 +11,16 @@
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".FragmentActivity"></activity>
+        <activity android:name=".FragmentActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -28,8 +29,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
+                android:resource="@xml/file_paths" />
         </provider>
     </application>
-
 </manifest>