Skip to content

Commit ea6f2ab

Browse files
authored
Merge pull request #24 from sultanmyrza/feat-migrate-to-capacitor-5
Feat migrate to capacitor 5
2 parents 3f214e4 + 053d26f commit ea6f2ab

File tree

8 files changed

+68
-64
lines changed

8 files changed

+68
-64
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.0.17 - 2023-06-26
4+
5+
### Chore
6+
7+
- Migrated to capacitor 5
8+
39
## 0.0.16 - 2023-06-19
410

511
### Added

android/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ ext {
66
}
77

88
buildscript {
9-
ext.kotlin_version = '1.8.0'
9+
ext.kotlin_version = '1.8.20'
1010
repositories {
1111
google()
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath 'com.android.tools.build:gradle:7.2.1'
15+
classpath 'com.android.tools.build:gradle:8.0.2'
1616
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1717
}
1818
}
@@ -21,10 +21,11 @@ apply plugin: 'com.android.library'
2121
apply plugin: 'kotlin-android'
2222

2323
android {
24+
namespace "io.numbersprotocol.capturelite.plugins.previewcamera"
2425
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
2526
defaultConfig {
2627
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
27-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
28+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
2829
versionCode 1
2930
versionName "1.0"
3031
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -45,8 +46,8 @@ android {
4546
abortOnError false
4647
}
4748
compileOptions {
48-
sourceCompatibility JavaVersion.VERSION_11
49-
targetCompatibility JavaVersion.VERSION_11
49+
sourceCompatibility JavaVersion.VERSION_17
50+
targetCompatibility JavaVersion.VERSION_17
5051
}
5152
}
5253

android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,3 @@ org.gradle.jvmargs=-Xmx1536m
2020
# Android operating system, and which are packaged with your app's APK
2121
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2222
android.useAndroidX=true
23-
# Automatically convert third-party libraries to use AndroidX
24-
android.enableJetifier=true
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Apr 28 15:47:15 CST 2023
1+
#Mon Jun 26 16:17:07 CST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="io.numbersprotocol.capturelite.plugins.previewcamera">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<uses-permission android:name="android.permission.RECORD_AUDIO" />
54
</manifest>

ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :ios, '12.0'
1+
platform :ios, '13.0'
22

33
def capacitor_pods
44
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks

package-lock.json

Lines changed: 45 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@numbersprotocol/preview-camera",
3-
"version": "0.0.16",
3+
"version": "0.0.17",
44
"description": "Preview Camera Plugin for iOS, Android",
55
"main": "dist/plugin.cjs.js",
66
"module": "dist/esm/index.js",
@@ -45,10 +45,10 @@
4545
"prepare": "npm run build"
4646
},
4747
"devDependencies": {
48-
"@capacitor/android": "^3.0.0",
49-
"@capacitor/core": "^3.0.0",
50-
"@capacitor/docgen": "^0.0.18",
51-
"@capacitor/ios": "^3.0.0",
48+
"@capacitor/android": "^5.0.5",
49+
"@capacitor/core": "^5.0.5",
50+
"@capacitor/docgen": "^0.2.1",
51+
"@capacitor/ios": "^5.0.5",
5252
"@ionic/eslint-config": "^0.3.0",
5353
"@ionic/prettier-config": "^1.0.1",
5454
"@ionic/swiftlint-config": "^1.1.2",
@@ -61,7 +61,7 @@
6161
"typescript": "~4.0.3"
6262
},
6363
"peerDependencies": {
64-
"@capacitor/core": "^3.0.0"
64+
"@capacitor/core": "^5.0.5"
6565
},
6666
"prettier": "@ionic/prettier-config",
6767
"swiftlint": "@ionic/swiftlint-config",

0 commit comments

Comments
 (0)