Skip to content

Commit e487923

Browse files
SkektecSkektec
authored
feat!: update to Capacitor 7 (#141)
BREAKING CHANGE: This plugin now only supports Capacitor 7.
1 parent 0abbf0f commit e487923

File tree

19 files changed

+5789
-1994
lines changed

19 files changed

+5789
-1994
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
NODE_VERSION: 18
12-
JAVA_VERSION: 17
11+
NODE_VERSION: 20
12+
JAVA_VERSION: 21
1313

1414
jobs:
1515
build:

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,7 @@ captures
5959

6060
# External native build folder generated in Android Studio 2.2 and later
6161
.externalNativeBuild
62+
63+
64+
#local secrets
65+
.env

‎.prettierignore

-2
This file was deleted.

‎CapacitorCommunityContacts.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '13.0'
14+
s.ios.deployment_target = '14.0'
1515
s.dependency 'Capacitor'
1616
s.swift_version = '5.1'
1717
end

‎README.md

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
<p align="center">
2-
<img src="https://user-images.githubusercontent.com/236501/85893648-1c92e880-b7a8-11ea-926d-95355b8175c7.png" width="128" height="128" />
2+
<img
3+
src="https://user-images.githubusercontent.com/236501/85893648-1c92e880-b7a8-11ea-926d-95355b8175c7.png"
4+
width="128"
5+
height="128"
6+
/>
37
</p>
48

5-
<h3 id="home" align="center">Contacts</h3>
9+
<h3 id="home" align="center">
10+
Contacts
11+
</h3>
612

7-
<p align="center"><strong><code>@capacitor-community/contacts</code></strong></p>
13+
<p align="center">
14+
<strong>
15+
<code>@capacitor-community/contacts</code>
16+
</strong>
17+
</p>
818

919
<p align="center">Capacitor Plugin for accessing Contacts.</p>
1020

1121
<p align="center">
12-
<img src="https://img.shields.io/badge/supported%20capacitor%20versions-v3,%20v4,%20v5%20and%20v6-blue?logo=Capacitor&style=flat-square" />
13-
<img src="https://img.shields.io/maintenance/yes/2024?style=flat-square" />
22+
<img src="https://img.shields.io/badge/supported%20capacitor%20versions-v3,%20v4,%20v5,%20v6%20and%20v7-blue?logo=Capacitor&style=flat-square" />
23+
<img src="https://img.shields.io/maintenance/yes/2025?style=flat-square" />
1424
<a href="https://www.npmjs.com/package/@capacitor-community/contacts">
1525
<img src="https://img.shields.io/npm/l/@capacitor-community/contacts?style=flat-square" />
1626
</a>
@@ -33,6 +43,7 @@ Currently there are three actively maintained versions of this plugin. The API o
3343

3444
| Plugin | Capacitor | Status | Documentation |
3545
| ------ | --------- | ------ | ------------------------------------------------------- |
46+
| v7.x | v7.x | LTS | [Link](https://capacitor-community.github.io/contacts/) |
3647
| v6.x | v6.x | LTS | [Link](https://capacitor-community.github.io/contacts/) |
3748
| v5.x | v5.x | LTS | [Link](https://capacitor-community.github.io/contacts/) |
3849
| v4.x | v4.x | LTS | [Link](https://capacitor-community.github.io/contacts/) |
@@ -51,7 +62,7 @@ In the past a few other versions of this plugin were released, also targeting di
5162

5263
Admittedly, this wasn't the most consistent versioning strategy, and we'll keep it more coherent in the future.
5364

54-
It's highly recommended to upgrade to either v3, v4, v5 or v6 if you are using an old version!
65+
It's highly recommended to upgrade to either v3, v4, v5, v6 or v7 if you are using an old version!
5566

5667
<p class="hide-next-element"></p>
5768

‎android/build.gradle

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
4-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
5-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
4+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
5+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
66
}
77

88
buildscript {
@@ -11,34 +11,38 @@ buildscript {
1111
mavenCentral()
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:8.2.1'
14+
classpath 'com.android.tools.build:gradle:8.7.2'
1515
}
1616
}
1717

1818
apply plugin: 'com.android.library'
1919

2020
android {
21-
namespace "getcapacitor.community.contacts"
22-
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
21+
namespace = "getcapacitor.community.contacts"
22+
compileSdkVersion(project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35)
23+
2324
defaultConfig {
24-
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
25-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
25+
minSdkVersion(project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23)
26+
targetSdkVersion(project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35)
2627
versionCode 1
2728
versionName "1.0"
2829
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2930
}
31+
3032
buildTypes {
3133
release {
3234
minifyEnabled false
3335
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3436
}
3537
}
38+
3639
lintOptions {
3740
abortOnError false
3841
}
42+
3943
compileOptions {
40-
sourceCompatibility JavaVersion.VERSION_17
41-
targetCompatibility JavaVersion.VERSION_17
44+
sourceCompatibility JavaVersion.VERSION_21
45+
targetCompatibility JavaVersion.VERSION_21
4246
}
4347
}
4448

@@ -47,7 +51,6 @@ repositories {
4751
mavenCentral()
4852
}
4953

50-
5154
dependencies {
5255
implementation fileTree(dir: 'libs', include: ['*.jar'])
5356
implementation project(':capacitor-android')

‎android/gradle/wrapper/gradle-wrapper.jar

-19.3 KB
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎android/gradlew

+13-9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
8385
# This is normally unused
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8791

8892
# Use the maximum available, or set MAX_FD != -1 to use that value.
8993
MAX_FD=maximum
@@ -144,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
146150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
148152
MAX_FD=$( ulimit -H -n ) ||
149153
warn "Could not query maximum file descriptor limit"
150154
esac
151155
case $MAX_FD in #(
152156
'' | soft) :;; #(
153157
*)
154158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
156160
ulimit -n "$MAX_FD" ||
157161
warn "Could not set maximum file descriptor limit to $MAX_FD"
158162
esac
@@ -201,11 +205,11 @@ fi
201205
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202206
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203207

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
209213

210214
set -- \
211215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎android/gradlew.bat

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

0 commit comments

Comments
 (0)