fix: merge conflict + bump version

capacitor-community · May 8, 2023 · 6ad2051 · 6ad2051
1 parent 7babaae
commit 6ad2051
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,18 +1,10 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-<<<<<<< HEAD
     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'
     googleAndroidPlayCoreVersion = project.hasProperty('googleAndroidPlayCoreVersion') ? rootProject.ext.googleAndroidPlayCoreVersion : '1.10.3'
-=======
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
     googleAndroidPlayReviewVersion = project.hasProperty('googleAndroidPlayReviewVersion') ? rootProject.ext.googleAndroidPlayReviewVersion : '2.0.1'
->>>>>>> c6f9382 (refactor android to use latest libs)
-
 }
 
 buildscript {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-rate-app",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Let users rate your app using native rate app dialog for both Android and iOS.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",