From b85ccd5dbd49dc4a802cb6d192f707a0e8757420 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 6 Feb 2026 19:43:56 +0530 Subject: [PATCH 1/5] update: gradle sources. --- app/build.gradle | 45 +++++++++++++++++++++++---------------------- build.gradle | 24 ++++++++++++++---------- dfc/build.gradle | 19 +++++++------------ gradle.properties | 4 ---- 4 files changed, 44 insertions(+), 48 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 023d63e..64aab42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,44 +1,45 @@ plugins { - id 'com.android.application' - id 'kotlin-android' + id "com.android.application" } android { - compileSdk 33 - namespace 'com.lazygeniouz.filecompat.example' + compileSdk = 36 + namespace = "com.lazygeniouz.filecompat.example" defaultConfig { - applicationId "com.lazygeniouz.filecompat.example" - minSdk 21 - targetSdk 33 - versionCode 1 - versionName "1.0" + applicationId = "com.lazygeniouz.filecompat.example" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk = 21 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + minifyEnabled = false + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + buildFeatures { + buildConfig = true } - kotlinOptions { - jvmTarget = '1.8' - freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } } dependencies { - implementation project(':dfc') + implementation project(":dfc") + //implementation "com.lazygeniouz:dfc:1.1" - implementation 'androidx.appcompat:appcompat:1.6.0' - implementation 'androidx.activity:activity-ktx:1.6.1' - implementation 'com.google.android.material:material:1.7.0' + implementation "androidx.appcompat:appcompat:1.7.1" + implementation "androidx.activity:activity-ktx:1.12.3" + implementation "androidx.documentfile:documentfile:1.1.0" + implementation "com.google.android.material:material:1.13.0" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index f0e7f42..9dcced5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary -import com.vanniktech.maven.publish.SonatypeHost +import com.vanniktech.maven.publish.JavadocJar +import com.vanniktech.maven.publish.SourcesJar buildscript { repositories { @@ -8,11 +9,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.7.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "com.android.tools.build:gradle:9.0.0" - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.20' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.30.0' + classpath "org.jetbrains.dokka:dokka-gradle-plugin:2.1.0" + classpath "com.vanniktech:gradle-maven-publish-plugin:0.36.0" } } @@ -23,18 +23,22 @@ allprojects { } plugins.withId("com.vanniktech.maven.publish.base") { - version "1.2" - group "com.lazygeniouz" + version = "1.2" + group = "com.lazygeniouz" mavenPublishing { signAllPublications() pomFromGradleProperties() - publishToMavenCentral(SonatypeHost.S01, true) - configure(new AndroidSingleVariantLibrary("release", true, true)) + publishToMavenCentral(true) + configure(new AndroidSingleVariantLibrary( + new JavadocJar.Dokka("dokkaHtml"), + new SourcesJar.Sources(), + "release" + )) } } } -tasks.register('clean', Delete) { +tasks.register("clean", Delete) { delete rootProject.layout.buildDirectory } \ No newline at end of file diff --git a/dfc/build.gradle b/dfc/build.gradle index d8121a2..6aca964 100644 --- a/dfc/build.gradle +++ b/dfc/build.gradle @@ -1,32 +1,27 @@ plugins { id 'com.android.library' - id 'kotlin-android' id 'org.jetbrains.dokka' id 'com.vanniktech.maven.publish.base' } android { - compileSdk 35 - namespace 'com.lazygeniouz.dfc' + compileSdk = 36 + namespace = "com.lazygeniouz.dfc" defaultConfig { - minSdk 21 - targetSdk 35 + minSdk = 21 + targetSdk = 36 } buildTypes { release { - minifyEnabled false + minifyEnabled = false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8f2c9e2..ce8f042 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,7 @@ android.useAndroidX=true kotlin.code.style=official -android.enableJetifier=true org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -android.nonFinalResIds=false -android.nonTransitiveRClass=false -android.defaults.buildfeatures.buildconfig=true POM_PACKAGING=aar POM_NAME=dfc From 884c6406e66dcf0874ecd8fef8f8272e6a1a3c4e Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 6 Feb 2026 19:44:03 +0530 Subject: [PATCH 2/5] update: sample app. --- .../com/lazygeniouz/filecompat/example/MainActivity.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt b/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt index ddeb0f2..aed464e 100644 --- a/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt +++ b/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt @@ -10,6 +10,7 @@ import android.os.storage.StorageManager import android.widget.Button import android.widget.ProgressBar import android.widget.TextView +import androidx.activity.addCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.view.isVisible @@ -83,6 +84,8 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) { textView = findViewById(R.id.fileNames) progress = findViewById(R.id.progress) + onBackPressedDispatcher.addCallback(this) { finishAffinity() } + buttonDir.setOnClickListener { folderResultLauncher.launch(getStorageIntent()) } @@ -100,8 +103,4 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) { } else Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) } } - - @Suppress("override_deprecation") - // this is just a sample app, ignore this. - override fun onBackPressed() = finishAffinity() } \ No newline at end of file From dfb724ef15117d446377a42fe2104d0b67e63914 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 6 Feb 2026 19:48:04 +0530 Subject: [PATCH 3/5] fix: sample app. --- app/build.gradle | 2 +- .../com/lazygeniouz/filecompat/example/MainActivity.kt | 9 +++------ app/src/main/res/layout/activity_main.xml | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 64aab42..71433b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { defaultConfig { applicationId = "com.lazygeniouz.filecompat.example" - minSdk = 21 + minSdk = 23 targetSdk = 36 versionCode = 1 versionName = "1.0" diff --git a/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt b/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt index aed464e..dd54152 100644 --- a/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt +++ b/app/src/main/java/com/lazygeniouz/filecompat/example/MainActivity.kt @@ -1,8 +1,6 @@ package com.lazygeniouz.filecompat.example import android.annotation.SuppressLint -import android.app.Activity -import android.content.Context import android.content.Intent import android.os.Build.VERSION.SDK_INT import android.os.Bundle @@ -30,7 +28,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) { private val folderResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - if (result.resultCode == Activity.RESULT_OK) { + if (result.resultCode == RESULT_OK) { val documentUri = result.data?.data if (documentUri != null) { textView.text = "" @@ -54,11 +52,10 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) { } } - @SuppressLint("SetTextI18n") private val fileResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - if (result.resultCode == Activity.RESULT_OK) { + if (result.resultCode == RESULT_OK) { val documentUri = result.data?.data if (documentUri != null) { textView.text = "" @@ -98,7 +95,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) { private fun getStorageIntent(single: Boolean = false): Intent { return if (single) Intent(Intent.ACTION_GET_CONTENT).setType("*/*") else { if (SDK_INT >= 30) { - val storageManager = getSystemService(Context.STORAGE_SERVICE) as StorageManager + val storageManager = getSystemService(STORAGE_SERVICE) as StorageManager storageManager.primaryStorageVolume.createOpenDocumentTreeIntent() } else Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b448fe3..8cf838c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,6 +2,7 @@ From 3c8be6cbe12fa4e0daec376ba9b29f54b5478fd5 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 6 Feb 2026 19:52:54 +0530 Subject: [PATCH 4/5] bump: gradle version. --- .gitignore | 1 + gradle/wrapper/gradle-wrapper.properties | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 30ce1e0..393f62c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ .idea build +.kotlin .gradle local.properties diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..7c20557 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ +#Fri Feb 06 19:51:09 IST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 1718fdd1e88dcc4081226eff338e64aec889cb9c Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 6 Feb 2026 20:04:10 +0530 Subject: [PATCH 5/5] bump: library version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9dcced5..0b15653 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ allprojects { } plugins.withId("com.vanniktech.maven.publish.base") { - version = "1.2" + version = "1.3" group = "com.lazygeniouz" mavenPublishing {