Skip to content

Commit 8d31cc5

Browse files
Merge pull request #415 from qonversion/release/11.0.0
Release/11.0.0
2 parents 0168aa6 + 505c587 commit 8d31cc5

31 files changed

+313
-456
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@
77
build/
88
.idea
99

10-
lib/*.jar
10+
lib/*.jar
11+
12+
# Local configuration files
13+
local.properties
14+
**/local.properties

android/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ buildscript {
66
repositories {
77
google()
88
mavenCentral()
9-
jcenter()
109
}
1110

1211
dependencies {
@@ -19,7 +18,6 @@ rootProject.allprojects {
1918
repositories {
2019
google()
2120
mavenCentral()
22-
jcenter()
2321
mavenLocal()
2422
}
2523
}
@@ -53,6 +51,6 @@ android {
5351

5452
dependencies {
5553
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
56-
implementation "io.qonversion:sandwich:6.0.11"
54+
implementation "io.qonversion:sandwich:7.1.0"
5755
implementation 'com.google.code.gson:gson:2.9.0'
5856
}

example/android/app/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232

3333
defaultConfig {
3434
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
35-
applicationId "com.qonversion.sample"
35+
applicationId "io.qonversion.sampleapp"
3636
minSdkVersion 21
3737
targetSdkVersion 34
3838
versionCode flutterVersionCode.toInteger()
@@ -74,7 +74,7 @@ android {
7474
lint {
7575
disable 'InvalidPackage'
7676
}
77-
namespace 'com.qonversion.sample'
77+
namespace 'io.qonversion.sampleapp'
7878
}
7979

8080
flutter {
@@ -86,4 +86,12 @@ dependencies {
8686
androidTestImplementation 'androidx.test:runner:1.1.1'
8787
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
8888
implementation 'androidx.multidex:multidex:2.0.1'
89+
// implementation project(':qonversion_flutter')
90+
}
91+
92+
// Задача wrapper для совместимости с Android Studio
93+
tasks.register("wrapper") {
94+
doLast {
95+
println "Wrapper task is only available in root project. Use './gradlew wrapper' from root."
96+
}
8997
}

example/android/app/google-services.json

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,26 @@
11
{
22
"project_info": {
3-
"project_number": "11599271839",
4-
"firebase_url": "https://qonversion-sample-app.firebaseio.com",
5-
"project_id": "qonversion-sample-app",
6-
"storage_bucket": "qonversion-sample-app.appspot.com"
3+
"project_number": "176235602178",
4+
"project_id": "qonversion-sample-applic-eb8a7",
5+
"storage_bucket": "qonversion-sample-applic-eb8a7.firebasestorage.app"
76
},
87
"client": [
98
{
109
"client_info": {
11-
"mobilesdk_app_id": "1:11599271839:android:134918dd6bba6f6970cfaa",
10+
"mobilesdk_app_id": "1:176235602178:android:b090da6fa0510c7192621b",
1211
"android_client_info": {
13-
"package_name": "com.qonversion.sample"
12+
"package_name": "io.qonversion.sampleapp"
1413
}
1514
},
16-
"oauth_client": [
17-
{
18-
"client_id": "11599271839-jg1njos9hp2d07jg7d3oqi523io0pdr6.apps.googleusercontent.com",
19-
"client_type": 3
20-
}
21-
],
15+
"oauth_client": [],
2216
"api_key": [
2317
{
24-
"current_key": "AIzaSyClJuW1Z3_lUnvnsCtjDl-P2vgTLMK39OA"
18+
"current_key": "AIzaSyA0fYxEeTDdoXZopKU54FtsN75FAcmZE9U"
2519
}
2620
],
2721
"services": {
2822
"appinvite_service": {
29-
"other_platform_oauth_client": [
30-
{
31-
"client_id": "11599271839-jg1njos9hp2d07jg7d3oqi523io0pdr6.apps.googleusercontent.com",
32-
"client_type": 3
33-
}
34-
]
23+
"other_platform_oauth_client": []
3524
}
3625
}
3726
}

example/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.qonversion.sample">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.qonversion.sampleapp">
22
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
33
calls FlutterMain.startInitialization(this); in its onCreate method.
44
In most cases you can leave this as-is, but you if you want to provide
@@ -9,7 +9,7 @@
99
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
1010
<uses-permission android:name="com.android.vending.BILLING"/>
1111
<application
12-
android:label="com.qonversion.sample"
12+
android:label="io.qonversion.sampleapp"
1313
android:icon="@mipmap/ic_launcher">
1414
<activity
1515
android:name="io.flutter.embedding.android.FlutterActivity"

example/android/app/src/main/assets/qonversion_android_fallbacks.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
"type": 2
6363
},
6464
{
65-
"id": "subs_plus_trial",
65+
"id": "semi-premium",
6666
"duration": 1,
67-
"store_id": "gp5_test_subscription_4",
67+
"store_id": "semi_premium",
6868
"type": 0
6969
},
7070
{
@@ -138,8 +138,9 @@
138138
"plus"
139139
],
140140
"consumable": [],
141-
"subs_plus_trial": [
142-
"standart"
141+
"semi-premium": [
142+
"premium",
143+
"semi_premium"
143144
],
144145
"annual": [
145146
"standart",

example/android/app/src/main/kotlin/com/qonversion/sample/MainActivity.kt renamed to example/android/app/src/main/kotlin/io/qonversion/sampleapp/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.qonversion.sample
1+
package io.qonversion.sampleapp
22

33
import androidx.annotation.NonNull;
44
import io.flutter.embedding.android.FlutterActivity

example/android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
allprojects {
22
repositories {
33
google()
4-
jcenter()
4+
mavenCentral()
55
}
66
}
77

@@ -16,3 +16,4 @@ subprojects {
1616
tasks.register("clean", Delete) {
1717
delete rootProject.buildDir
1818
}
19+

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Fri Dec 04 11:26:13 MSK 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip

0 commit comments

Comments
 (0)