Support android 35,36 with edge to edge

2025-10-06 00:02:43 +02:00 · 2025-07-07 18:01:49 +03:00
parent 4190c30f0a
commit e599499737
6 changed files with 80 additions and 77 deletions
--- a/Builder/build.gradle
+++ b/Builder/build.gradle
@@ -8,7 +8,7 @@ dependencies {
    //implementation project(':smartreflow')
 }

-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
+//java {
+    //sourceCompatibility = JavaVersion.VERSION_1_8
+    //targetCompatibility = JavaVersion.VERSION_1_8
+//}
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ def taskName = getGradle().getStartParameter().getTaskRequests().toString()


 ext {
-    FDroidCodeNumber = 6202
-    FDroidVersionNumber = "8.9.182"
+    FDroidCodeNumber = 6230
+    FDroidVersionNumber = "8.9.190"
 }


@@ -29,17 +29,17 @@ ext {
 }

 android {
-    compileSdk project.compileSdk
-    namespace "com.foobnix.pdf.info"
+    compileSdk = project.compileSdk
+    namespace = "com.foobnix.pdf.info"

    defaultConfig {
-        namespace "com.foobnix.pdf.info"
-        minSdk project.minSdk
-        targetSdk project.targetSdk
-        versionCode codeNumber
-        versionName versionNumber
+        namespace = "com.foobnix.pdf.info"
+        minSdk = project.minSdk
+        targetSdk = project.targetSdk
+        versionCode = codeNumber
+        versionName = versionNumber
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
+        multiDexEnabled = true
    }

    configurations {
@@ -50,9 +50,9 @@ android {
    }

    lint {
-        abortOnError true
-        ignoreWarnings true
-        checkReleaseBuilds taskName.contains("Pro")
+        abortOnError = true
+        ignoreWarnings = true
+        checkReleaseBuilds = taskName.contains("Pro")
    }

    testOptions {
@@ -73,37 +73,37 @@ android {

    buildTypes {
        release {
-            minifyEnabled false
-            signingConfig signingConfigs.release
-            debuggable false
+            minifyEnabled = false
+            signingConfig = signingConfigs.release
+            debuggable = false
        }
        debug {
-            debuggable true
+            debuggable = true
        }
    }

-    compileOptions {
+    //compileOptions {
        //coreLibraryDesugaringEnabled true

-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+        //sourceCompatibility JavaVersion.VERSION_1_8
+        //targetCompatibility JavaVersion.VERSION_1_8
+    //}

    splits {
        abi {
-            enable true
+            enable = true
            reset()
            include "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
-            universalApk true
+            universalApk = true
        }
    }

    flavorDimensions.add("version")
    productFlavors {
        fdroid {
-            minSdk 16
-            dimension "version"
-            applicationId "com.foobnix.pro.pdf.reader"
+            minSdk = project.minFDroidSdk
+            dimension = "version"
+            applicationId = "com.foobnix.pro.pdf.reader"
            manifestPlaceholders = [
                    appName      : "Librera FD",
                    appIcon      : "@mipmap/icon_pdf_pro",
@@ -114,11 +114,11 @@ android {
                    admobFullId  : "",
                    appSafeMode  : "true"
            ]
-            versionNameSuffix '-fdroid'
+            versionNameSuffix = '-fdroid'
        }
        librera {
-            dimension "version"
-            applicationId "com.foobnix.pdf.reader"
+            dimension = "version"
+            applicationId = "com.foobnix.pdf.reader"
            manifestPlaceholders = [
                    appName      : "Librera",
                    appIcon      : "@mipmap/icon_pdf_reader",
@@ -132,8 +132,8 @@ android {
        }

        pro {
-            dimension "version"
-            applicationId "com.foobnix.pro.pdf.reader"
+            dimension = "version"
+            applicationId = "com.foobnix.pro.pdf.reader"
            manifestPlaceholders = [
                    appName      : "Librera",
                    appIcon      : "@mipmap/icon_pdf_pro",
@@ -146,8 +146,8 @@ android {
            ]
        }
        pdf_classic {
-            dimension "version"
-            applicationId "classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri"
+            dimension = "version"
+            applicationId = "classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri"
            manifestPlaceholders = [
                    appName      : "PDF Reader",
                    appIcon      : "@mipmap/icon_pdf_classic",
@@ -160,8 +160,8 @@ android {
            ]
        }
        ebooka {
-            dimension "version"
-            applicationId "droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3"
+            dimension = "version"
+            applicationId = "droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3"
            manifestPlaceholders = [
                    appName      : "Book Reader",
                    appIcon      : "@mipmap/icon_pdf_droid",
@@ -174,8 +174,8 @@ android {
            ]
        }
        pdf_v2 {
-            dimension "version"
-            applicationId "pdf.pdf.reader"
+            dimension = "version"
+            applicationId = "pdf.pdf.reader"
            manifestPlaceholders = [
                    appName      : "PDF Reader",
                    appIcon      : "@mipmap/icon_pdf_2",
@@ -188,8 +188,8 @@ android {
            ]
        }
        tts_reader {
-            dimension "version"
-            applicationId "tts.reader"
+            dimension = "version"
+            applicationId = "tts.reader"
            manifestPlaceholders = [
                    appName      : "TTS Reader",
                    appIcon      : "@mipmap/icon_tts_reader_app",
@@ -202,8 +202,8 @@ android {
            ]
        }
        epub_reader {
-            dimension "version"
-            applicationId "epub.reader"
+            dimension = "version"
+            applicationId = "epub.reader"
            manifestPlaceholders = [
                    appName      : "Epub Reader",
                    appIcon      : "@mipmap/icon_epub_reader",
@@ -282,10 +282,10 @@ dependencies {
 /** AndroidX **/
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'androidx.work:work-runtime:2.10.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.work:work-runtime:2.10.2'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'

 /** Third-party **/
    implementation 'com.github.axet:lame:1.0.9'
@@ -295,7 +295,7 @@ dependencies {
        exclude group: 'org.greenrobot.greendao.rx'
    }
    implementation 'org.greenrobot:greendao-api:3.3.0'
-    implementation 'org.jsoup:jsoup:1.18.1'
+    implementation 'org.jsoup:jsoup:1.21.1'

    implementation 'com.github.albfernandez:juniversalchardet:2.5.0'

@@ -318,8 +318,8 @@ dependencies {
    implementation "commons-logging:commons-logging-api:1.1"


-    implementation 'androidx.work:work-runtime:2.10.0'
-    implementation 'com.google.guava:guava:33.3.1-android'
+    implementation 'androidx.work:work-runtime:2.10.2'
+    implementation 'com.google.guava:guava:33.4.8-android'

    //implementation "it.unimi.dsi:fastutil-core:8.5.12"

@@ -333,7 +333,7 @@ dependencies {


 /** Ads **/
-    def google_ads = "com.google.android.gms:play-services-ads:23.5.0"
+    def google_ads = "com.google.android.gms:play-services-ads:24.4.0"
    libreraImplementation google_ads
    pdf_v2Implementation google_ads
    ebookaImplementation google_ads
@@ -341,7 +341,7 @@ dependencies {
    pdf_classicImplementation google_ads
    epub_readerImplementation google_ads

-    def messaging_ads = "com.google.android.ump:user-messaging-platform:3.1.0"
+    def messaging_ads = "com.google.android.ump:user-messaging-platform:3.2.0"
    libreraImplementation messaging_ads
    pdf_v2Implementation messaging_ads
    ebookaImplementation messaging_ads
@@ -362,12 +362,12 @@ task copyApks() {
    if (project.hasProperty('beta') || project.hasProperty("release")) {
        println "My Task: [copy apks]"

-        delete fileTree("/home/dev/Dropbox/FREE_PDF_APK/testing").include("*.apk")
-        delete fileTree("/home/dev/Nextcloud/LibreraBeta").include("*.apk")
-        delete fileTree("/Users/dev/Library/CloudStorage/Dropbox/FREE_PDF_APK/testing").include("*.apk")
+        //delete fileTree("/home/dev/Dropbox/FREE_PDF_APK/testing").include("*.apk")
+        //delete fileTree("/home/dev/Nextcloud/LibreraBeta").include("*.apk")
+        delete fileTree("/Users/ivanivanenko/Library/CloudStorage/Dropbox/FREE_PDF_APK/testing").include("*.apk")

-        delete fileTree("/Users/dev/Library/CloudStorage/Dropbox/FREE_PDF_APK/$versionNumber").include("*.apk")
-        delete fileTree("/home/dev/Dropbox/FREE_PDF_APK/testing/$versionNumber").include("*.apk")
+        delete fileTree("/Users/ivanivanenko/Library/CloudStorage/Dropbox/FREE_PDF_APK/$versionNumber").include("*.apk")
+        //delete fileTree("/home/dev/Dropbox/FREE_PDF_APK/testing/$versionNumber").include("*.apk")

        android.applicationVariants.all { variant ->
            if ("release" == variant.buildType.name) {
@@ -378,15 +378,15 @@ task copyApks() {
                def list = []

                if (project.hasProperty("beta")) {
-                    list.add("/home/dev/Nextcloud/LibreraBeta")
-                    list.add("/Users/dev/Library/CloudStorage/Dropbox/FREE_PDF_APK/testing")
-                    list.add("/home/dev/Dropbox/FREE_PDF_APK/testing")
+                    //list.add("/home/dev/Nextcloud/LibreraBeta")
+                    list.add("/Users/ivanivanenko/Library/CloudStorage/Dropbox/FREE_PDF_APK/testing")
+                    //list.add("/home/dev/Dropbox/FREE_PDF_APK/testing")
                }


                if (project.hasProperty("release")) {
-                    list.add("/home/dev/Dropbox/FREE_PDF_APK/testing/$versionNumber")
-                    list.add("/Users/dev/Library/CloudStorage/Dropbox/FREE_PDF_APK/testing/$versionNumber")
+                    //list.add("/home/dev/Dropbox/FREE_PDF_APK/testing/$versionNumber")
+                    list.add("/Users/ivanivanenko/Library/CloudStorage/Dropbox/FREE_PDF_APK/testing/$versionNumber")
                }
                list.each { dest ->

@@ -458,3 +458,4 @@ if (!taskName.contains("Fdroid")) {
        }
    }
 }
+
--- a/app/gradle.properties
+++ b/app/gradle.properties
@@ -1,5 +1,5 @@
-#Wed Jul 24 11:55:08 EEST 2024
-appCodeNumber=6202
+#Mon Jul 07 18:01:29 EEST 2025
+appCodeNumber=6234
 appDB=8
 appVersionNumberBase=8.9
-appVersionNumberIndex=182
+appVersionNumberIndex=190
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,8 @@

 buildscript {
    ext {
+        agp_version = '8.11.0'
+
        //compose_ui_version = '1.5.3'
    }
    repositories {
@@ -9,7 +11,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath "com.android.tools.build:gradle:$agp_version"
        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20'
    }
 }
@@ -18,14 +20,14 @@ allprojects {
    repositories {
        google()
        mavenCentral()
-        maven { url 'https://jitpack.io' }
+        maven { url = 'https://jitpack.io' }
    }
 }
 project.ext {
-    targetSdk = 36 //need to fix edge-to-edge in Android 15
-    minSdk = 21
+    targetSdk = 36
+    minSdk = 24
+    minFDroidSdk = 16
    compileSdk = 36
-   // compose_ui_version = '1.5.3'
 }

 task clean(type: Delete) {
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 04 11:01:47 EET 2023
+#Mon Jul 07 17:29:19 EEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/pro/build.gradle
+++ b/pro/build.gradle
@@ -3,11 +3,11 @@ plugins {
 }

 android {
-    compileSdk project.compileSdk
+    compileSdk = project.compileSdk

    defaultConfig {
-        minSdk 14
-        targetSdk project.targetSdk
+        minSdk = project.minSdk
+        targetSdk = project.targetSdk
    }

    buildTypes {
@@ -16,7 +16,7 @@ android {
            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
-    namespace 'com.foobnix.pdf.pro'
+    namespace = 'com.foobnix.pdf.pro'
 }

 dependencies {