From b5648b63bfd4d88ecb87eb6ebf0af451b15132e9 Mon Sep 17 00:00:00 2001 From: RCGitBot Date: Mon, 6 Nov 2023 18:19:38 +0000 Subject: [PATCH 1/9] Version bump for 7.3.0 --- android/build.gradle | 2 +- ios/purchases_flutter.podspec | 2 +- macos/purchases_flutter.podspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 0d8b6797e..6a1e61e26 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,7 @@ version '6.3.0-SNAPSHOT' buildscript { ext.kotlin_version = '1.7.21' - ext.common_version = '7.2.0' + ext.common_version = '7.3.0' repositories { google() mavenCentral() diff --git a/ios/purchases_flutter.podspec b/ios/purchases_flutter.podspec index 237f7cb95..f983a6f0f 100644 --- a/ios/purchases_flutter.podspec +++ b/ios/purchases_flutter.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'PurchasesHybridCommon', '7.2.0' + s.dependency 'PurchasesHybridCommon', '7.3.0' s.ios.deployment_target = '11.0' s.swift_version = '5.0' diff --git a/macos/purchases_flutter.podspec b/macos/purchases_flutter.podspec index bdb5acfc3..ef8dff9b7 100644 --- a/macos/purchases_flutter.podspec +++ b/macos/purchases_flutter.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'FlutterMacOS' - s.dependency 'PurchasesHybridCommon', '7.2.0' + s.dependency 'PurchasesHybridCommon', '7.3.0' s.platform = :osx, '10.12' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' From 4d410b1cb0fc95d46b3614d51728f0b3a2a9b781 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Mon, 6 Nov 2023 20:30:33 +0100 Subject: [PATCH 2/9] fix multidex --- api_tester/android/build.gradle | 2 +- fastlane/Fastfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api_tester/android/build.gradle b/api_tester/android/build.gradle index eec254f11..ab792ae48 100644 --- a/api_tester/android/build.gradle +++ b/api_tester/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8e9c32c78..174f2bcf2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -227,7 +227,7 @@ end def build_api_tester_apk Dir.chdir("../api_tester") do - sh("flutter", "build", "apk", "--debug") + sh("flutter", "build", "apk", "--debug", "--multidex") end end From 4bf45567e90149f5bc599de659b350773d77e7d9 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Wed, 8 Nov 2023 23:42:06 +0100 Subject: [PATCH 3/9] change order of flags --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 174f2bcf2..015c7cd8c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -227,7 +227,7 @@ end def build_api_tester_apk Dir.chdir("../api_tester") do - sh("flutter", "build", "apk", "--debug", "--multidex") + sh("flutter", "build", "apk", "--multidex", "--debug") end end From c585cd5ba093302607bb7ed89d41540aa3dc3363 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Wed, 8 Nov 2023 23:47:14 +0100 Subject: [PATCH 4/9] get dependencies --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53663cd72..28f463ada 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -190,6 +190,8 @@ jobs: - install-sdkman - revenuecat/install-gem-unix-dependencies: cache-version: v1 + - flutter-get-dependencies: + project: api_tester - run: name: Run API tests command: bundle exec fastlane run_api_tests From dcc5e56928962896e1fafcb6993fd43a23377e6a Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Wed, 8 Nov 2023 23:51:38 +0100 Subject: [PATCH 5/9] flutter doctor --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28f463ada..01ce56cf7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -190,6 +190,9 @@ jobs: - install-sdkman - revenuecat/install-gem-unix-dependencies: cache-version: v1 + - run: + name: Flutter doctor + command: flutter doctor -v - flutter-get-dependencies: project: api_tester - run: From 1ce476088e88288b3f4cf65ebf87dfd315f40289 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Thu, 9 Nov 2023 00:09:26 +0100 Subject: [PATCH 6/9] add build step before --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01ce56cf7..3ee1e30fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -190,11 +190,12 @@ jobs: - install-sdkman - revenuecat/install-gem-unix-dependencies: cache-version: v1 - - run: - name: Flutter doctor - command: flutter doctor -v - flutter-get-dependencies: project: api_tester + - run: + working_directory: api_tester + name: Run API tests + command: flutter build apk --debug --multidex - run: name: Run API tests command: bundle exec fastlane run_api_tests From 37e8e13964c12b400dac4cf3f4a57464a202de96 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Thu, 9 Nov 2023 00:18:12 +0100 Subject: [PATCH 7/9] enable multidex in project --- api_tester/android/app/build.gradle | 2 ++ fastlane/Fastfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api_tester/android/app/build.gradle b/api_tester/android/app/build.gradle index 3eb426197..235dcb0bf 100644 --- a/api_tester/android/app/build.gradle +++ b/api_tester/android/app/build.gradle @@ -51,6 +51,7 @@ android { targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true } buildTypes { @@ -69,4 +70,5 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "androidx.multidex:multidex:2.0.1" } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 015c7cd8c..8e9c32c78 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -227,7 +227,7 @@ end def build_api_tester_apk Dir.chdir("../api_tester") do - sh("flutter", "build", "apk", "--multidex", "--debug") + sh("flutter", "build", "apk", "--debug") end end From b4a4c3b235bd2bf37049cfb276a83f419f5f2580 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Thu, 9 Nov 2023 00:21:32 +0100 Subject: [PATCH 8/9] pass y --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ee1e30fa..da55f7dd1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -195,7 +195,7 @@ jobs: - run: working_directory: api_tester name: Run API tests - command: flutter build apk --debug --multidex + command: y | flutter build apk --debug --multidex - run: name: Run API tests command: bundle exec fastlane run_api_tests From 050fb6170d4b9e16ae504bf8de7e8bfb962471c2 Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Thu, 9 Nov 2023 00:21:48 +0100 Subject: [PATCH 9/9] remove extra step --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index da55f7dd1..28f463ada 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,10 +192,6 @@ jobs: cache-version: v1 - flutter-get-dependencies: project: api_tester - - run: - working_directory: api_tester - name: Run API tests - command: y | flutter build apk --debug --multidex - run: name: Run API tests command: bundle exec fastlane run_api_tests