Add consumer proguard rules to prevent minification (#137)

* Add consumer proguard rules to prevent minification

* Update snapshot

* Explicitly set swift version to 3.1.2

Author: markmur

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.1.2 - November 4, 2024
+
+- Add `consumerProguardRules` build.gradle option to prevent minification of
+  classes in release builds.
+
 ## 3.1.1 - November 1, 2024
 
 - Logs invalid JSON for lifecycle events

modules/@shopify/checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/*.{h,m,mm,swift}"
 
 	s.dependency "React-Core"
-	s.dependency "ShopifyCheckoutSheetKit", "~> 3.1.1"
+	s.dependency "ShopifyCheckoutSheetKit", "~> 3.1.2"
 
   if fabric_enabled
 		install_modules_dependencies(s)

modules/@shopify/checkout-sheet-kit/android/build.gradle

@@ -60,8 +60,15 @@ android {
   }
 
   buildTypes {
+    debug {
+      minifyEnabled false
+    }
+
     release {
       minifyEnabled false
+
+      // Rules in consumerProguardFiles are automatically included in the ProGuard configuration of any application that uses the library
+      consumerProguardFiles 'proguard-rules.pro'
     }
   }
 

modules/@shopify/checkout-sheet-kit/android/gradle.properties

@@ -5,4 +5,4 @@ ndkVersion=23.1.7779620
 buildToolsVersion = "33.0.0"
 
 # Version of Shopify Checkout SDK to use with React Native
-SHOPIFY_CHECKOUT_SDK_VERSION=3.2.0
+SHOPIFY_CHECKOUT_SDK_VERSION=3.2.2

modules/@shopify/checkout-sheet-kit/android/proguard-rules.pro

@@ -0,0 +1,2 @@
+# Keep Checkout Sheet Kit classes
+-keep class com.shopify.checkoutsheetkit.** { *; }

modules/@shopify/checkout-sheet-kit/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shopify/checkout-sheet-kit",
   "license": "MIT",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "main": "lib/commonjs/index.js",
   "types": "src/index.ts",
   "source": "src/index.ts",

modules/@shopify/checkout-sheet-kit/package.snapshot.json

@@ -3,6 +3,7 @@
   "RNShopifyCheckoutSheetKit.podspec",
   "android/build.gradle",
   "android/gradle.properties",
+  "android/proguard-rules.pro",
   "android/src/main/AndroidManifest.xml",
   "android/src/main/AndroidManifestNew.xml",
   "android/src/main/java/com/shopify/reactnative/checkoutsheetkit/CustomCheckoutEventProcessor.java",

sample/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '>= 1.15'
+gem 'cocoapods', '1.15.0'
 gem 'cocoapods-check', '1.1.0'
 gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

sample/Gemfile.lock

@@ -10,18 +10,18 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.15.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.15.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -38,7 +38,7 @@ GEM
       xcodeproj (>= 1.23.0, < 2.0)
     cocoapods-check (1.1.0)
       cocoapods (~> 1.0)
-    cocoapods-core (1.15.2)
+    cocoapods-core (1.15.0)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -62,43 +62,41 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.16.3)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.8.2)
     minitest (5.20.0)
     molinillo (0.8.0)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     ruby-macho (2.5.1)
-    strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (>= 6.1.7.5, < 7.1.0)
-  cocoapods (>= 1.15)
+  cocoapods (= 1.15.0)
   cocoapods-check (= 1.1.0)
 
 RUBY VERSION

sample/android/app/build.gradle

@@ -53,11 +53,6 @@ react {
      hermesFlags = ["-O", "-output-source-map"]
 }
 
-/**
- * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
- */
-def enableProguardInReleaseBuilds = false
-
 /**
  * The preferred build flavor of JavaScriptCore (JSC)
  *
@@ -115,7 +110,7 @@ android {
     }
     release {
       signingConfig signingConfigs.release
-      minifyEnabled enableProguardInReleaseBuilds
+      minifyEnabled true
       proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
     }
   }