Skip to content

Added android 12 support #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added android 12 support #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ group = 'com.artifex.mupdf'
version = '1.19.0'

dependencies {
implementation 'androidx.appcompat:appcompat:1.1.+'
implementation 'androidx.appcompat:appcompat:1.4.1'
if (file('../lib/build.gradle').isFile())
api project(':lib')
else
api 'com.artifex.mupdf:viewer:1.19.0'
}

android {
compileSdkVersion 28
compileSdkVersion 31
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 31
versionName '1.19.0'
versionCode 100
}
Expand Down Expand Up @@ -48,4 +48,9 @@ android {
}
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
38 changes: 18 additions & 20 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.artifex.mupdf.viewer.app"
android:installLocation="auto"
>
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
/>
<application
android:label="MuPDF viewer"
android:icon="@drawable/ic_mupdf"
>
<activity
android:name=".LibraryActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
package="com.artifex.mupdf.viewer.app"
android:installLocation="auto">

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:allowBackup="false"
android:icon="@drawable/ic_mupdf"
android:label="MuPDF viewer">
<activity
android:name=".LibraryActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:4.1.3'
}
}

Expand Down
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Jan 27 15:16:28 PKT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
6 changes: 3 additions & 3 deletions lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ group = 'com.artifex.mupdf'
version = '1.19.0'

dependencies {
implementation 'androidx.appcompat:appcompat:1.1.+'
implementation 'androidx.appcompat:appcompat:1.4.1'
if (file('../jni/build.gradle').isFile())
api project(':jni')
else
api 'com.artifex.mupdf:fitz:1.19.0'
}

android {
compileSdkVersion 28
compileSdkVersion 31
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 31
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<activity
android:name=".DocumentActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
>
android:exported="true">
<intent-filter>
<!-- match content and file requests with known mime-type -->
<action android:name="android.intent.action.VIEW" />
Expand Down