diff --git a/.gitignore b/.gitignore index f5267efa..abff9b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,8 @@ build/ .idea -lib/*.jar \ No newline at end of file +lib/*.jar + +# Local configuration files +local.properties +**/local.properties \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 5fbbad53..57019380 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,6 @@ buildscript { repositories { google() mavenCentral() - jcenter() } dependencies { @@ -19,7 +18,6 @@ rootProject.allprojects { repositories { google() mavenCentral() - jcenter() mavenLocal() } } @@ -53,6 +51,6 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "io.qonversion:sandwich:6.0.11" + implementation "io.qonversion:sandwich:7.1.0" implementation 'com.google.code.gson:gson:2.9.0' } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 15b9519f..f551a019 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -32,7 +32,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.qonversion.sample" + applicationId "io.qonversion.sampleapp" minSdkVersion 21 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() @@ -74,7 +74,7 @@ android { lint { disable 'InvalidPackage' } - namespace 'com.qonversion.sample' + namespace 'io.qonversion.sampleapp' } flutter { @@ -86,4 +86,12 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation 'androidx.multidex:multidex:2.0.1' +// implementation project(':qonversion_flutter') +} + +// Задача wrapper для совместимости с Android Studio +tasks.register("wrapper") { + doLast { + println "Wrapper task is only available in root project. Use './gradlew wrapper' from root." + } } diff --git a/example/android/app/google-services.json b/example/android/app/google-services.json index 172f3660..049d1675 100644 --- a/example/android/app/google-services.json +++ b/example/android/app/google-services.json @@ -1,37 +1,26 @@ { "project_info": { - "project_number": "11599271839", - "firebase_url": "https://qonversion-sample-app.firebaseio.com", - "project_id": "qonversion-sample-app", - "storage_bucket": "qonversion-sample-app.appspot.com" + "project_number": "176235602178", + "project_id": "qonversion-sample-applic-eb8a7", + "storage_bucket": "qonversion-sample-applic-eb8a7.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:11599271839:android:134918dd6bba6f6970cfaa", + "mobilesdk_app_id": "1:176235602178:android:b090da6fa0510c7192621b", "android_client_info": { - "package_name": "com.qonversion.sample" + "package_name": "io.qonversion.sampleapp" } }, - "oauth_client": [ - { - "client_id": "11599271839-jg1njos9hp2d07jg7d3oqi523io0pdr6.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyClJuW1Z3_lUnvnsCtjDl-P2vgTLMK39OA" + "current_key": "AIzaSyA0fYxEeTDdoXZopKU54FtsN75FAcmZE9U" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "11599271839-jg1njos9hp2d07jg7d3oqi523io0pdr6.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } } diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 97f50f26..c0f731a3 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - +