diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9c25b8..d109a0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Set up JDK 17 diff --git a/.github/workflows/validate-gradle-wrapper.yml b/.github/workflows/validate-gradle-wrapper.yml index 64aa173..b5f0b31 100644 --- a/.github/workflows/validate-gradle-wrapper.yml +++ b/.github/workflows/validate-gradle-wrapper.yml @@ -7,5 +7,5 @@ jobs: name: Validation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dc12f67..dfb5d47 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -37,7 +37,7 @@ android { defaultConfig { minSdk = 21 - targetSdk = 31 + targetSdk = 32 resourceConfigurations.add("en") } diff --git a/app/pdfjs-dist b/app/pdfjs-dist index a7fc0d3..070a365 160000 --- a/app/pdfjs-dist +++ b/app/pdfjs-dist @@ -1 +1 @@ -Subproject commit a7fc0d33a11d032741f44d0b623780253747da10 +Subproject commit 070a365be5a7579f4ddd5a9a2d4efcd281c2d64f diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d0b01f8..0ded85f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java b/app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java similarity index 98% rename from app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java rename to app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java index 45fd9c7..28e643f 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer; +package app.grapheneos.pdfviewer; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java similarity index 98% rename from app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java rename to app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java index cd4fbf6..06e2e7a 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer; +package app.grapheneos.pdfviewer; import android.content.pm.PackageInfo; import android.content.res.ColorStateList; @@ -29,10 +29,10 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; -import org.grapheneos.pdfviewer.databinding.PdfviewerBinding; -import org.grapheneos.pdfviewer.fragment.DocumentPropertiesFragment; -import org.grapheneos.pdfviewer.fragment.JumpToPageFragment; -import org.grapheneos.pdfviewer.loader.DocumentPropertiesLoader; +import app.grapheneos.pdfviewer.databinding.PdfviewerBinding; +import app.grapheneos.pdfviewer.fragment.DocumentPropertiesFragment; +import app.grapheneos.pdfviewer.fragment.JumpToPageFragment; +import app.grapheneos.pdfviewer.loader.DocumentPropertiesLoader; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/Utils.java b/app/src/main/java/app/grapheneos/pdfviewer/Utils.java similarity index 99% rename from app/src/main/java/org/grapheneos/pdfviewer/Utils.java rename to app/src/main/java/app/grapheneos/pdfviewer/Utils.java index ffc8411..0e7ae24 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/Utils.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/Utils.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer; +package app.grapheneos.pdfviewer; import android.text.TextUtils; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java b/app/src/main/java/app/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java similarity index 96% rename from app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java rename to app/src/main/java/app/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java index 851d9d5..47f039b 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/fragment/DocumentPropertiesFragment.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer.fragment; +package app.grapheneos.pdfviewer.fragment; import android.app.Activity; import android.app.Dialog; @@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.grapheneos.pdfviewer.R; +import app.grapheneos.pdfviewer.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java b/app/src/main/java/app/grapheneos/pdfviewer/fragment/JumpToPageFragment.java similarity index 96% rename from app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java rename to app/src/main/java/app/grapheneos/pdfviewer/fragment/JumpToPageFragment.java index 489ce82..99ff01c 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/fragment/JumpToPageFragment.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/fragment/JumpToPageFragment.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer.fragment; +package app.grapheneos.pdfviewer.fragment; import android.app.Dialog; import android.os.Bundle; @@ -11,7 +11,7 @@ import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import org.grapheneos.pdfviewer.PdfViewer; +import app.grapheneos.pdfviewer.PdfViewer; public class JumpToPageFragment extends DialogFragment { public static final String TAG = "JumpToPageFragment"; diff --git a/app/src/main/java/org/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java b/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java similarity index 96% rename from app/src/main/java/org/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java rename to app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java index 3bafbe5..fb12f44 100644 --- a/app/src/main/java/org/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java +++ b/app/src/main/java/app/grapheneos/pdfviewer/loader/DocumentPropertiesLoader.java @@ -1,4 +1,4 @@ -package org.grapheneos.pdfviewer.loader; +package app.grapheneos.pdfviewer.loader; import android.content.Context; import android.graphics.Typeface; @@ -9,8 +9,6 @@ import android.util.Log; import androidx.loader.content.AsyncTaskLoader; -import org.grapheneos.pdfviewer.R; -import org.grapheneos.pdfviewer.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -18,6 +16,9 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; +import app.grapheneos.pdfviewer.R; +import app.grapheneos.pdfviewer.Utils; + public class DocumentPropertiesLoader extends AsyncTaskLoader> { public static final String TAG = "DocumentPropertiesLoader"; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1debed0..ffe61b4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists