From 559d2cf1e30e0bafdaad98411f2108027af7d571 Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Wed, 20 Sep 2023 15:39:58 -0700 Subject: [PATCH 1/2] fix: android ci --- .github/workflows/android-release.yml | 6 +++--- .../extension-app-native/android/app/build.gradle | 2 +- .../main/java/io/picsa/extension_toolkit/MainActivity.java | 7 +------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 125d995ee..1fb19d5fc 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -13,9 +13,9 @@ on: release: types: [published] workflow_dispatch: - # push: - # branches: - # - main + push: + branches: + - fix/android-ci jobs: android_release: runs-on: ubuntu-latest diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle index db383a7fd..fb9cf9bb4 100644 --- a/apps/picsa-apps/extension-app-native/android/app/build.gradle +++ b/apps/picsa-apps/extension-app-native/android/app/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation project(':capacitor-cordova-android-plugins') // Required for capacitor-video-player - implementation 'com.google.android.gms:play-services-cast-framework:21.2.0' + implementation 'com.google.android.gms:play-services-cast-framework:21.3.0' implementation(platform("com.google.firebase:firebase-bom:32.3.1")) } diff --git a/apps/picsa-apps/extension-app-native/android/app/src/main/java/io/picsa/extension_toolkit/MainActivity.java b/apps/picsa-apps/extension-app-native/android/app/src/main/java/io/picsa/extension_toolkit/MainActivity.java index 9052fdb44..801f2a94f 100644 --- a/apps/picsa-apps/extension-app-native/android/app/src/main/java/io/picsa/extension_toolkit/MainActivity.java +++ b/apps/picsa-apps/extension-app-native/android/app/src/main/java/io/picsa/extension_toolkit/MainActivity.java @@ -3,10 +3,5 @@ import com.getcapacitor.BridgeActivity; public class MainActivity extends BridgeActivity { - // required for capacitor-video-player - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - CastContext.getSharedInstance(this); - } + } From fce18134f6942687cc0e7db201e684ed1c5975f7 Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Wed, 20 Sep 2023 16:20:14 -0700 Subject: [PATCH 2/2] chore: bump version --- .github/workflows/android-release.yml | 6 +++--- .../extension-app-native/android/app/build.gradle | 4 ++-- libs/environments/src/version.ts | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 1fb19d5fc..125d995ee 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -13,9 +13,9 @@ on: release: types: [published] workflow_dispatch: - push: - branches: - - fix/android-ci + # push: + # branches: + # - main jobs: android_release: runs-on: ubuntu-latest diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle index fb9cf9bb4..22cd2e867 100644 --- a/apps/picsa-apps/extension-app-native/android/app/build.gradle +++ b/apps/picsa-apps/extension-app-native/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "io.picsa.extension" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 3034000 - versionName "3.34.0" + versionCode 3034001 + versionName "3.34.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/libs/environments/src/version.ts b/libs/environments/src/version.ts index 6b39314c0..4898e9cb5 100644 --- a/libs/environments/src/version.ts +++ b/libs/environments/src/version.ts @@ -4,5 +4,5 @@ import packageJson from '../../../package.json'; export const APP_VERSION = { number: packageJson.version, - date: '2023-09-19', + date: '2023-09-20', }; diff --git a/package.json b/package.json index 4d3cd04f1..fb0a24967 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "picsa-apps", - "version": "3.34.0", + "version": "3.34.1", "license": "See LICENSE", "scripts": { "ng": "nx",