Merge pull request heroku#380 from heroku/develop

v166
sixpark · Dec 20, 2019 · 8d807ac · 8d807ac
2 parents 417772a + 3c78409
commit 8d807ac
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # heroku-buildpack-php CHANGELOG
 
+## v166 (2019-12-20)
+
+### ADD
+
+- PHP/7.2.26 [David Zuelke]
+- PHP/7.3.13 [David Zuelke]
+- ext-rdkafka/4.0.2 [David Zuelke]
+
 ## v165 (2019-12-11)
 
 ### ADD

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,59 +1,61 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     erubis (2.7.0)
-    excon (0.66.0)
+    excon (0.71.1)
     heroics (0.0.25)
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
-    heroku_hatchet (4.0.12)
+    heroku_hatchet (4.0.13)
       excon (~> 0)
       minitest-retry (~> 0.1.9)
       platform-api (~> 2)
       repl_runner (~> 0.0.3)
       rrrretry (~> 1)
       thor (~> 0)
       threaded (~> 0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
+    minitest (5.13.0)
     minitest-retry (0.1.9)
       minitest (>= 5.0)
     moneta (1.0.0)
-    multi_json (1.13.1)
-    parallel (1.17.0)
-    parallel_tests (2.29.2)
+    multi_json (1.14.1)
+    parallel (1.19.1)
+    parallel_tests (2.30.0)
       parallel
     platform-api (2.2.0)
       heroics (~> 0.0.25)
       moneta (~> 1.0.0)
-    rake (12.3.3)
+    rake (13.0.1)
     repl_runner (0.0.3)
       activesupport
     rrrretry (1.0.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
+      rspec-support (~> 3.9.0)
+    rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.8.2)
+    rspec-support (3.9.0)
     sem_version (2.0.1)
     thor (0.20.3)
     thread_safe (0.3.6)
     threaded (0.0.4)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

diff --git a/bin/compile b/bin/compile
@@ -218,7 +218,7 @@ fi
 mkdir -p $build_dir/.heroku/php-min
 ln -s $build_dir/.heroku/php-min /app/.heroku/php-min
 
-curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.12.tar.gz" || {
+curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.13.tar.gz" || {
 	mcount "failures.bootstrap.download.php-min"
 	error <<-EOF
 		Failed to download minimal PHP for bootstrapping!

diff --git a/...s/no-debug-non-zts-20121212/rdkafka-4.0.1 → ...s/no-debug-non-zts-20121212/rdkafka-4.0.2 b/...s/no-debug-non-zts-20121212/rdkafka-4.0.1 → ...s/no-debug-non-zts-20121212/rdkafka-4.0.2
diff --git a/...s/no-debug-non-zts-20131226/rdkafka-4.0.1 → ...s/no-debug-non-zts-20131226/rdkafka-4.0.2 b/...s/no-debug-non-zts-20131226/rdkafka-4.0.1 → ...s/no-debug-non-zts-20131226/rdkafka-4.0.2
diff --git a/...s/no-debug-non-zts-20151012/rdkafka-4.0.1 → ...s/no-debug-non-zts-20151012/rdkafka-4.0.2 b/...s/no-debug-non-zts-20151012/rdkafka-4.0.1 → ...s/no-debug-non-zts-20151012/rdkafka-4.0.2
diff --git a/...s/no-debug-non-zts-20160303/rdkafka-4.0.1 → ...s/no-debug-non-zts-20160303/rdkafka-4.0.2 b/...s/no-debug-non-zts-20160303/rdkafka-4.0.1 → ...s/no-debug-non-zts-20160303/rdkafka-4.0.2
diff --git a/...s/no-debug-non-zts-20170718/rdkafka-4.0.1 → ...s/no-debug-non-zts-20170718/rdkafka-4.0.2 b/...s/no-debug-non-zts-20170718/rdkafka-4.0.1 → ...s/no-debug-non-zts-20170718/rdkafka-4.0.2
diff --git a/...s/no-debug-non-zts-20180731/rdkafka-4.0.1 → ...s/no-debug-non-zts-20180731/rdkafka-4.0.2 b/...s/no-debug-non-zts-20180731/rdkafka-4.0.1 → ...s/no-debug-non-zts-20180731/rdkafka-4.0.2
diff --git a/support/build/php-7.2.25 → support/build/php-7.2.26 b/support/build/php-7.2.25 → support/build/php-7.2.26
diff --git a/support/build/php-7.3.12 → support/build/php-7.3.13 b/support/build/php-7.3.12 → support/build/php-7.3.13
diff --git a/support/build/php-min-7.3.12 → support/build/php-min-7.3.13 b/support/build/php-min-7.3.12 → support/build/php-min-7.3.13