Skip to content

Commit

Permalink
Merge branch 'android-update-dependencies'
Browse files Browse the repository at this point in the history
  • Loading branch information
christocracy committed Sep 6, 2024
2 parents cf550ff + a689bd0 commit 23cb1bd
Show file tree
Hide file tree
Showing 25 changed files with 17,367 additions and 1,144 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## [6.0.1] — 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).

## [6.0.0] — 2024-04-26
* Ugrade to Capacitor v6.

Expand Down
4 changes: 1 addition & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ext {
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
}
Expand All @@ -18,7 +17,7 @@ buildscript {

apply plugin: 'com.android.library'

def DEFAULT_LIFE_CYCLE_RUNTIME_VERSION = "2.4.1"
def DEFAULT_LIFE_CYCLE_RUNTIME_VERSION = "2.7.0"
def DEFAULT_LIFE_CYCLE_EXTENSIONS_VERSION = "2.2.0"

def safeExtGet(prop, fallback) {
Expand Down Expand Up @@ -67,7 +66,6 @@ dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':capacitor-android')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
// LifeCycleObserver
implementation "androidx.lifecycle:lifecycle-runtime:$lifeCycleRuntimeVersion"
implementation "androidx.lifecycle:lifecycle-extensions:$lifeCycleExtensionsVersion"
Expand Down
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
26bb061b033d138f588df9ed89a3a54e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
caa6ddf88d942e5728e504b4172e7cc8f3fafdf0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
29d3987e946f460e85c58e14fc6a5d6a004cd7c269cd4e8f6923faaf97152e58
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1a66aa25f6a0bc1ce60de23cda0e6739946d1e80790080a53ff5b808af7edc1b66867e0b6272675f6448467b0821883a0169ed029f9a356bb7bb8afddb30558f
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.transistorsoft</groupId>
<artifactId>tsbackgroundfetch</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<packaging>aar</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
80d3d425012d38f61670b9b423701e5c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
26f4123bdb16e46603194ad747d2cb614be488d7
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bed46c47b67cd13dfd34ba4ee1a7e69601efd3d212c9c544e9f129e78006c48f
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
71425f9663dde5dc04f99d6027f1199819de527b2ef7bb7d57f0ef09d91f86f1e1ff289e1aa9568ebeac721e06f973a3440a2e38fa334c3e93eaec6f313a23f9
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<groupId>com.transistorsoft</groupId>
<artifactId>tsbackgroundfetch</artifactId>
<versioning>
<latest>1.0.2</latest>
<release>1.0.2</release>
<latest>1.0.3</latest>
<release>1.0.3</release>
<versions>
<version>1.0.1</version>
<version>1.0.2</version>
<version>1.0.3</version>
</versions>
<lastUpdated>20230821210933</lastUpdated>
<lastUpdated>20240906171023</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.transistorsoft.bgfetch.capacitor;

import android.content.pm.PackageManager;
import android.util.Log;

import com.getcapacitor.JSObject;
Expand Down Expand Up @@ -155,7 +156,7 @@ private BackgroundFetchConfig.Builder buildConfig(JSObject options) throws JSONE
}

private String getHeadlessClassName() {
return getActivity().getClass().getPackage().getName() + "." + HEADLESS_CLASSNAME;
return getContext().getPackageName() + "." + HEADLESS_CLASSNAME;
}

private BackgroundFetch getAdapter() {
Expand Down
Loading

0 comments on commit 23cb1bd

Please sign in to comment.