Skip to content

Commit ca6dc4c

Browse files
simoarpesimoarpe
authored
Merge pull request #70 from PSPDFKit/simone/update-android-to-6.5.2
Update Android part to PSPDFKit 6.5.2
2 parents c6f3560 + a310804 commit ca6dc4c

File tree

5 files changed

+12
-73
lines changed

5 files changed

+12
-73
lines changed

‎README.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ Platform specific README exists for [Android](android/) and [iOS](ios/).
1717

1818
### Android
1919

20+
#### Requirements
21+
22+
- Android SDK 29.0.3 or later
23+
- PSPDFKit 6.5.2 for Android or later
24+
- Flutter 1.22.0-12.1.pre or later
25+
2026
Let's create a simple app that integrates PSPDFKit and uses the Flutter pspdfkit plugin.
2127

2228
1. Run `flutter create --org com.example.myapp myapp`.
@@ -51,7 +57,7 @@ flutter.buildMode=debug
5157
```diff
5258
...
5359
android {
54-
compileSdkVersion 28
60+
compileSdkVersion 29
5561
5662
+ compileOptions {
5763
+ sourceCompatibility 1.8
@@ -67,11 +73,10 @@ android {
6773
applicationId "com.example.myapp"
6874
- minSdkVersion 16
6975
+ minSdkVersion 21
70-
targetSdkVersion 28
76+
targetSdkVersion 29
7177
+ multiDexEnabled true
7278
versionCode flutterVersionCode.toInteger()
7379
versionName flutterVersionName
74-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
7580
}
7681
...
7782
```

‎android/config.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ if (pspdfkitMavenUrl == null || pspdfkitMavenUrl == '') {
2626

2727
ext.pspdfkitVersion = localProperties.getProperty('pspdfkit.version')
2828
if (pspdfkitVersion == null || pspdfkitVersion == '') {
29-
ext.pspdfkitVersion = '6.5.0'
29+
ext.pspdfkitVersion = '6.5.2'
3030
}
3131

3232
ext.pspdfkitMavenModuleName = 'pspdfkit'
3333

34-
ext.pspdfkitFlutterVersion = '1.9.0-SNAPSHOT'
34+
ext.pspdfkitFlutterVersion = '1.10.0'
3535

3636
ext.androidCompileSdkVersion = 29
3737
ext.androidBuildToolsVersion = '29.0.1'

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
6E58FD42C5C650D180E8B6F7 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9222D47AA509D70776A755B3 /* libPods-Runner.a */; };
1312
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1413
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1514
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -34,11 +33,9 @@
3433
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3534
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3635
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
37-
7680CF0EE621C4C588CA8319 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3836
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
3937
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4038
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
41-
9222D47AA509D70776A755B3 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4239
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4340
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4441
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -47,29 +44,19 @@
4744
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4845
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4946
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50-
EA8AE65FF465391772EFF6C0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
5147
/* End PBXFileReference section */
5248

5349
/* Begin PBXFrameworksBuildPhase section */
5450
97C146EB1CF9000F007C117D /* Frameworks */ = {
5551
isa = PBXFrameworksBuildPhase;
5652
buildActionMask = 2147483647;
5753
files = (
58-
6E58FD42C5C650D180E8B6F7 /* libPods-Runner.a in Frameworks */,
5954
);
6055
runOnlyForDeploymentPostprocessing = 0;
6156
};
6257
/* End PBXFrameworksBuildPhase section */
6358

6459
/* Begin PBXGroup section */
65-
28FB19379A2349AC9DE981D7 /* Frameworks */ = {
66-
isa = PBXGroup;
67-
children = (
68-
9222D47AA509D70776A755B3 /* libPods-Runner.a */,
69-
);
70-
name = Frameworks;
71-
sourceTree = "<group>";
72-
};
7360
9740EEB11CF90186004384FC /* Flutter */ = {
7461
isa = PBXGroup;
7562
children = (
@@ -87,8 +74,6 @@
8774
9740EEB11CF90186004384FC /* Flutter */,
8875
97C146F01CF9000F007C117D /* Runner */,
8976
97C146EF1CF9000F007C117D /* Products */,
90-
D20A32FD2B4A9D4673751062 /* Pods */,
91-
28FB19379A2349AC9DE981D7 /* Frameworks */,
9277
);
9378
sourceTree = "<group>";
9479
};
@@ -124,30 +109,19 @@
124109
name = "Supporting Files";
125110
sourceTree = "<group>";
126111
};
127-
D20A32FD2B4A9D4673751062 /* Pods */ = {
128-
isa = PBXGroup;
129-
children = (
130-
7680CF0EE621C4C588CA8319 /* Pods-Runner.debug.xcconfig */,
131-
EA8AE65FF465391772EFF6C0 /* Pods-Runner.release.xcconfig */,
132-
);
133-
name = Pods;
134-
sourceTree = "<group>";
135-
};
136112
/* End PBXGroup section */
137113

138114
/* Begin PBXNativeTarget section */
139115
97C146ED1CF9000F007C117D /* Runner */ = {
140116
isa = PBXNativeTarget;
141117
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
142118
buildPhases = (
143-
E1AF3E206B008E8CDBC63177 /* [CP] Check Pods Manifest.lock */,
144119
9740EEB61CF901F6004384FC /* Run Script */,
145120
97C146EA1CF9000F007C117D /* Sources */,
146121
97C146EB1CF9000F007C117D /* Frameworks */,
147122
97C146EC1CF9000F007C117D /* Resources */,
148123
9705A1C41CF9048500538489 /* Embed Frameworks */,
149124
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
150-
5127C02A549D9E00B743CD7F /* [CP] Embed Pods Frameworks */,
151125
);
152126
buildRules = (
153127
);
@@ -219,28 +193,6 @@
219193
shellPath = /bin/sh;
220194
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
221195
};
222-
5127C02A549D9E00B743CD7F /* [CP] Embed Pods Frameworks */ = {
223-
isa = PBXShellScriptBuildPhase;
224-
buildActionMask = 2147483647;
225-
files = (
226-
);
227-
inputPaths = (
228-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
229-
"${PODS_ROOT}/../Flutter/Flutter.framework",
230-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/PSPDFKit/PSPDFKit.framework/PSPDFKit",
231-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/PSPDFKitUI/PSPDFKitUI.framework/PSPDFKitUI",
232-
);
233-
name = "[CP] Embed Pods Frameworks";
234-
outputPaths = (
235-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
236-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework",
237-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework",
238-
);
239-
runOnlyForDeploymentPostprocessing = 0;
240-
shellPath = /bin/sh;
241-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
242-
showEnvVarsInLog = 0;
243-
};
244196
9740EEB61CF901F6004384FC /* Run Script */ = {
245197
isa = PBXShellScriptBuildPhase;
246198
buildActionMask = 2147483647;
@@ -255,24 +207,6 @@
255207
shellPath = /bin/sh;
256208
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
257209
};
258-
E1AF3E206B008E8CDBC63177 /* [CP] Check Pods Manifest.lock */ = {
259-
isa = PBXShellScriptBuildPhase;
260-
buildActionMask = 2147483647;
261-
files = (
262-
);
263-
inputPaths = (
264-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
265-
"${PODS_ROOT}/Manifest.lock",
266-
);
267-
name = "[CP] Check Pods Manifest.lock";
268-
outputPaths = (
269-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
270-
);
271-
runOnlyForDeploymentPostprocessing = 0;
272-
shellPath = /bin/sh;
273-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
274-
showEnvVarsInLog = 0;
275-
};
276210
/* End PBXShellScriptBuildPhase section */
277211

278212
/* Begin PBXSourcesBuildPhase section */

‎example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: pspdfkit_example
22
description: Demonstrates how to use the pspdfkit plugin.
3-
version: 1.9.0
3+
version: 1.10.0
44
author: PSPDFKit
55
homepage: https://pspdfkit.com/
66
environment:

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: pspdfkit_flutter
22
description: PSPDFKit flutter plugin.
3-
version: 1.9.0
3+
version: 1.10.0
44
author: PSPDFKit
55
homepage: https://pspdfkit.com/
66
environment:

0 commit comments

Comments
 (0)