From 3766e2a3e742d9835dbe5ba539ccb568b6634136 Mon Sep 17 00:00:00 2001 From: plebeius Date: Sat, 9 Aug 2025 19:47:42 +0200 Subject: [PATCH 1/4] chore(package.json): v0.5.8 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 680977c9..71cab2c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [0.5.8](https://github.com/plebbit/seedit/compare/v0.5.7...v0.5.8) (2025-08-09) + + +### Bug Fixes + +* **android:** implement cross-platform account export ([b0b06db](https://github.com/plebbit/seedit/commit/b0b06db8c55b3e6bb6c1148acbc61d7ddf6c2d2c)) +* edit comment state would get stuck at pending ([4251325](https://github.com/plebbit/seedit/commit/4251325b2a131bd64e5b8e8c8f1df20d7c20f581)) +* resolve Android export dialog and permission issues ([01d7e1c](https://github.com/plebbit/seedit/commit/01d7e1c209d9899ea13502d70f6cf75786b5ec2c)) + + + ## [0.5.7](https://github.com/plebbit/seedit/compare/v0.5.6...v0.5.7) (2025-08-06) diff --git a/package.json b/package.json index 65e35820..2eb5a8d3 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Seedit", - "version": "0.5.7", + "version": "0.5.8", "description": "A GUI for plebbit similar to old.reddit", "author": "Plebbit Labs", "type": "module", From a5373aa9baa44233cde6e9ec02e1b8c95917bcb1 Mon Sep 17 00:00:00 2001 From: plebeius Date: Sat, 9 Aug 2025 19:59:21 +0200 Subject: [PATCH 2/4] fix: resolve Android CI build failure with Google Services plugin The Android CI build was failing because the code tried to read `google-services.json` content without first checking if the file exists. --- .github/workflows/release.yml | 2 +- android/app/build.gradle | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5903101b..d3d12a8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -156,7 +156,7 @@ jobs: - run: npx cap update - run: npx cap copy - run: cd android && gradle bundle - - run: cd android && ./gradlew assembleRelease + - run: cd android && ./gradlew assembleRelease --stacktrace # optimize apk - run: cd android/app/build/outputs/apk/release && zipalign 4 app-release-unsigned.apk app-release-unsigned-zip.apk # sign apk diff --git a/android/app/build.gradle b/android/app/build.gradle index 061753ce..0ae65d82 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -58,9 +58,12 @@ apply from: 'capacitor.build.gradle' try { def servicesJSON = file('google-services.json') - if (servicesJSON.text) { + if (servicesJSON.exists() && servicesJSON.text) { apply plugin: 'com.google.gms.google-services' + logger.info("google-services.json found, applying Google Services plugin") + } else { + logger.info("google-services.json not found or empty, Google Services plugin not applied. Push Notifications won't work") } } catch(Exception e) { - logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work") + logger.info("Error checking google-services.json: ${e.message}. Google Services plugin not applied") } From 390eced823c69db5f295327b465d14d04387f2b4 Mon Sep 17 00:00:00 2001 From: plebeius Date: Sat, 9 Aug 2025 20:05:24 +0200 Subject: [PATCH 3/4] Update build.gradle --- android/app/build.gradle | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0ae65d82..aaec967b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -56,14 +56,24 @@ dependencies { apply from: 'capacitor.build.gradle' +// Google Services plugin - only apply if file exists and has content +// This is wrapped in multiple safety checks to prevent CI failures try { def servicesJSON = file('google-services.json') - if (servicesJSON.exists() && servicesJSON.text) { - apply plugin: 'com.google.gms.google-services' - logger.info("google-services.json found, applying Google Services plugin") + if (servicesJSON != null && servicesJSON.exists() && servicesJSON.length() > 0) { + try { + // Additional safety check - ensure the plugin is available in classpath + apply plugin: 'com.google.gms.google-services' + println("✓ Google Services plugin applied successfully") + } catch (Exception pluginError) { + println("⚠ Google Services plugin not available or failed to apply: ${pluginError.message}") + println(" This is not a critical error - the app will build without push notifications") + } } else { - logger.info("google-services.json not found or empty, Google Services plugin not applied. Push Notifications won't work") + println("ℹ google-services.json not found - building without Google Services") + println(" Push notifications will not be available, but this is not an error") } } catch(Exception e) { - logger.info("Error checking google-services.json: ${e.message}. Google Services plugin not applied") + println("ℹ Google Services check failed: ${e.message}") + println(" Continuing build without Google Services - this is not a critical error") } From f7df22a504e241d8d47af849a6b59937f5a3ca4e Mon Sep 17 00:00:00 2001 From: plebeius Date: Sat, 9 Aug 2025 20:16:36 +0200 Subject: [PATCH 4/4] fix: revert Google Services to working config and remove hardcoded Java path --- android/app/build.gradle | 20 +++++--------------- android/gradle.properties | 3 --- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index aaec967b..0ae65d82 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -56,24 +56,14 @@ dependencies { apply from: 'capacitor.build.gradle' -// Google Services plugin - only apply if file exists and has content -// This is wrapped in multiple safety checks to prevent CI failures try { def servicesJSON = file('google-services.json') - if (servicesJSON != null && servicesJSON.exists() && servicesJSON.length() > 0) { - try { - // Additional safety check - ensure the plugin is available in classpath - apply plugin: 'com.google.gms.google-services' - println("✓ Google Services plugin applied successfully") - } catch (Exception pluginError) { - println("⚠ Google Services plugin not available or failed to apply: ${pluginError.message}") - println(" This is not a critical error - the app will build without push notifications") - } + if (servicesJSON.exists() && servicesJSON.text) { + apply plugin: 'com.google.gms.google-services' + logger.info("google-services.json found, applying Google Services plugin") } else { - println("ℹ google-services.json not found - building without Google Services") - println(" Push notifications will not be available, but this is not an error") + logger.info("google-services.json not found or empty, Google Services plugin not applied. Push Notifications won't work") } } catch(Exception e) { - println("ℹ Google Services check failed: ${e.message}") - println(" Continuing build without Google Services - this is not a critical error") + logger.info("Error checking google-services.json: ${e.message}. Google Services plugin not applied") } diff --git a/android/gradle.properties b/android/gradle.properties index 6981f3c9..20728a62 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -26,6 +26,3 @@ android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false android.suppressUnsupportedCompileSdk=35 - -# Force Gradle to use Java 17 for all operations -org.gradle.java.home=/opt/homebrew/Cellar/openjdk@17/17.0.16/libexec/openjdk.jdk/Contents/Home