Merge branch 'release-6.0.2'

transistorsoft · Dec 3, 2024 · 53d2977 · 53d2977
2 parents 23cb1bd + ca0bd1c
commit 53d2977
Show file tree

Hide file tree

Showing 48 changed files with 90 additions and 115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [6.0.2] &mdash; 2024-12-03
+* [Android] Remove Android Setup Step for `proguard-rules.pro`.  The plugin is able to automatically apply its `proguard-rules`.
+
 ## [6.0.1] &mdash; 2024-09-06
 * [Android] Update default version for `androidx.lifecycle:lifecycle-runtime` to `2.7.0`.
 * [Android] Remove dependency `androidx.appcompat:appcompat` (no longer required).

diff --git a/android/build.gradle b/android/build.gradle
@@ -36,6 +36,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'proguard-rules.pro'
     }
     buildTypes {
         release {

diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.md5 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.md5
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.sha1 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.sha1
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.sha256 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.sha256
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.sha512 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.aar.sha512
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.md5 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.md5
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.sha1 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.sha1
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.sha256 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.sha256
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.sha512 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.3/tsbackgroundfetch-1.0.3.pom.sha512
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.md5 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.md5
@@ -0,0 +1 @@
+8179b611fd9f6fb07357b9b7dfde781b
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.sha1 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.sha1
@@ -0,0 +1 @@
+eb0a4f6a810f05eec51d5b92b846a70693c52be6
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.sha256 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.sha256
@@ -0,0 +1 @@
+7678cef9a5ff3942720e2839aa82473a81e06ba5e0ca672cfaa2100a98b66468
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.sha512 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.aar.sha512
@@ -0,0 +1 @@
+7fa2f89c2a79cf5ff6070e3986914fff7f46d91dfe40ab21a70875556f429bffb99b085c59b10951063cb717896f94fb7a478611607fb544eb838a87470bea1c
diff --git a/...ndfetch/1.0.3/tsbackgroundfetch-1.0.3.pom → ...ndfetch/1.0.4/tsbackgroundfetch-1.0.4.pom b/...ndfetch/1.0.3/tsbackgroundfetch-1.0.3.pom → ...ndfetch/1.0.4/tsbackgroundfetch-1.0.4.pom
@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.transistorsoft</groupId>
   <artifactId>tsbackgroundfetch</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <packaging>aar</packaging>
 </project>
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.md5 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.md5
@@ -0,0 +1 @@
+d17405d8d49a051f96c9e960f7059109
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.sha1 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.sha1
@@ -0,0 +1 @@
+1fd4138746b94af71350424a33c0160c154812d9
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.sha256 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.sha256
@@ -0,0 +1 @@
+3702c65bb77f6c0741f6005e770968fb015877378f3a1c8b8e7c31f47da65aa1
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.sha512 b/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.4/tsbackgroundfetch-1.0.4.pom.sha512
@@ -0,0 +1 @@
+820e817adf42044cbab55e028a9d142741ae2b211c829e145813ad720320d92f118136f73835f096123168a18fbabf5c056f3e57fe0f95b403a682ce73854dd7
diff --git a/android/libs/com/transistorsoft/tsbackgroundfetch/maven-metadata.xml b/android/libs/com/transistorsoft/tsbackgroundfetch/maven-metadata.xml
@@ -3,12 +3,13 @@
   <groupId>com.transistorsoft</groupId>
   <artifactId>tsbackgroundfetch</artifactId>
   <versioning>
-    <latest>1.0.3</latest>
-    <release>1.0.3</release>
+    <latest>1.0.4</latest>
+    <release>1.0.4</release>
     <versions>
       <version>1.0.2</version>
       <version>1.0.3</version>
+      <version>1.0.4</version>
     </versions>
-    <lastUpdated>20240906171023</lastUpdated>
+    <lastUpdated>20241128152535</lastUpdated>
   </versioning>
 </metadata>
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
@@ -1,21 +1,2 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# [capacitor-background-fetch]
+-keep class **BackgroundFetchHeadlessTask { *; }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/help/INSTALL-ANDROID.md b/help/INSTALL-ANDROID.md
@@ -34,16 +34,6 @@ allprojects {
 }
 ```
 
-## Configure __`proguard-rules.pro`__
-
-1.  In *Android Studio*, edit `android/app/proguard-rules.pro (ProGuard rules for android.app)`.
-2.  Add the following rule:
-
-```bash
-# [capacitor-background-fetch]
--keep class **BackgroundFetchHeadlessTask { *; }
-```
-
 ## Precise event-scheduling with `forceAlarmManager: true`:
 
 **Only** If you wish to use precise scheduling of events with __`forceAlarmManager: true`__, *Android 14 (SDK 34)*, has restricted usage of ["`AlarmManager` exact alarms"](https://developer.android.com/about/versions/14/changes/schedule-exact-alarms).  To continue using precise timing of events with *Android 14*, you can manually add this permission to your __`AndroidManifest`__.  Otherwise, the plugin will gracefully fall-back to "*in-exact* `AlarmManager` scheduling":

diff --git a/ios/TSBackgroundFetch.xcframework/Info.plist b/ios/TSBackgroundFetch.xcframework/Info.plist
@@ -6,9 +6,9 @@
 	<array>
 		<dict>
 			<key>BinaryPath</key>
-			<string>TSBackgroundFetch.framework/TSBackgroundFetch</string>
+			<string>TSBackgroundFetch.framework/Versions/A/TSBackgroundFetch</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>TSBackgroundFetch.framework</string>
 			<key>SupportedArchitectures</key>
@@ -19,7 +19,7 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -37,9 +37,9 @@
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
-			<string>TSBackgroundFetch.framework/Versions/A/TSBackgroundFetch</string>
+			<string>TSBackgroundFetch.framework/TSBackgroundFetch</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>TSBackgroundFetch.framework</string>
 			<key>SupportedArchitectures</key>
@@ -50,7 +50,7 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/ios/TSBackgroundFetch.xcframework/_CodeSignature/CodeDirectory b/ios/TSBackgroundFetch.xcframework/_CodeSignature/CodeDirectory
diff --git a/ios/TSBackgroundFetch.xcframework/_CodeSignature/CodeRequirements-1 b/ios/TSBackgroundFetch.xcframework/_CodeSignature/CodeRequirements-1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		7678cef9a5ff3942720e2839aa82473a81e06ba5e0ca672cfaa2100a98b66468
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		7fa2f89c2a79cf5ff6070e3986914fff7f46d91dfe40ab21a70875556f429bffb99b085c59b10951063cb717896f94fb7a478611607fb544eb838a87470bea1c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		3702c65bb77f6c0741f6005e770968fb015877378f3a1c8b8e7c31f47da65aa1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		820e817adf42044cbab55e028a9d142741ae2b211c829e145813ad720320d92f118136f73835f096123168a18fbabf5c056f3e57fe0f95b403a682ce73854dd7