From fb572f65bd257d540b853a1fbbb54896a3d64114 Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Mon, 19 Aug 2024 21:47:26 +0000 Subject: [PATCH 01/25] Update required CMake --- CMakeLists.txt | 9 +-------- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-s3 | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- 12 files changed, 12 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8771c8ba9..dce08261d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,9 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.13) project(aws-crt-jni C) option(BUILD_DEPS "Builds aws common runtime dependencies as part of build" ON) option(CRT_FIPS "Whether to build aws-lc with FIPS compliance" OFF) -if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags -endif() - -if (POLICY CMP0077) - cmake_policy(SET CMP0077 NEW) # Enable options to get their values from normal variables -endif() if (DEFINED CMAKE_PREFIX_PATH) file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 52bf59161..084868560 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 52bf591613d1a001c43ec99af7376f871759c5fe +Subproject commit 084868560e6856943a5b906916ab4957e7c61b70 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 77ca3aea8..29f1c6eef 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 77ca3aea879bc768082fe7ec715adcde8e98c332 +Subproject commit 29f1c6eef4416736e8c4d545691b5e7f369bdc54 diff --git a/crt/aws-c-common b/crt/aws-c-common index 672cc0032..53a446550 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 672cc0032eb28d69fbdd22c9463253c89d7a6f30 +Subproject commit 53a446550a722154065193e6e4c67af918124cb5 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ea1d421a4..ff2120184 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ea1d421a421ad83a540309a94c38d50b6a5d836b +Subproject commit ff21201842dee4a30563c424f5f753bbef3f648e diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 1b3825fc9..051cc8879 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 1b3825fc9cae2e9c7ed7479ee5d354d52ebdf7a0 +Subproject commit 051cc887993f8676621404055056b0be7dfdf0a8 diff --git a/crt/aws-c-http b/crt/aws-c-http index 4e74ab1e3..66b9fced5 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 4e74ab1e3702763e0b87bd1752f5a37c2f0400ac +Subproject commit 66b9fced53f0032705f70e88e8f05581183559af diff --git a/crt/aws-c-io b/crt/aws-c-io index c345d7727..1e29ae8aa 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2 +Subproject commit 1e29ae8aa63847220c339a7ee9903685eca7134b diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index ed7bbd68c..5edf91839 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit ed7bbd68c03d7022c915a2924740ab7992ad2311 +Subproject commit 5edf91839929ed4059bc3ecc340d344c8e17f5ca diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 0ab4d58ef..ac268340f 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 0ab4d58ef0bd97970d43828cb6b57a3de5747343 +Subproject commit ac268340f0c43f5f923f45e2a69cf7ead1bd13b8 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 4658412a6..f3f6cd10e 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 4658412a61ad5749db92a8d1e0717cb5e76ada1c +Subproject commit f3f6cd10e0f8352640f557174a5ef3c62d5f6147 diff --git a/crt/aws-checksums b/crt/aws-checksums index aac442a2d..53c112b63 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit aac442a2dbbb5e72d0a3eca8313cf65e7e1cac2f +Subproject commit 53c112b6315ef600a4604d4f1f9b673beb4ec8b0 From 0bf7f174e5962c76c2b0d00cbb4405a84661d180 Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Fri, 23 Aug 2024 05:00:59 +0000 Subject: [PATCH 02/25] latest --- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- crt/aws-c-s3 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 29f1c6eef..0627591cf 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 29f1c6eef4416736e8c4d545691b5e7f369bdc54 +Subproject commit 0627591cf9fc587bd357fea0b34f984dc3609a11 diff --git a/crt/aws-c-common b/crt/aws-c-common index 53a446550..484fddaf0 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 53a446550a722154065193e6e4c67af918124cb5 +Subproject commit 484fddaf09b65e97b6577c020a131e9f5bdb1106 diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 051cc8879..305f71f94 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 051cc887993f8676621404055056b0be7dfdf0a8 +Subproject commit 305f71f94ac401a51c53ddcd05c454472e7f18ab diff --git a/crt/aws-c-http b/crt/aws-c-http index 66b9fced5..3225effef 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 66b9fced53f0032705f70e88e8f05581183559af +Subproject commit 3225effefb4d6ae99e7f5edd51a55df6fc5d83fa diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index ac268340f..5453f6bbd 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit ac268340f0c43f5f923f45e2a69cf7ead1bd13b8 +Subproject commit 5453f6bbd424f0924d5df97fdf233f40c10b321e From d67615d8528829ebfc2585edea2ed3e40623a7fb Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Mon, 14 Oct 2024 22:25:13 +0000 Subject: [PATCH 03/25] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 246f8f2d4..a753a81ed 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This library is licensed under the Apache 2.0 License. ### Linux/Unix Requirements: * Clang 3.9+ or GCC 4.4+ -* cmake 3.1+ +* cmake 3.13+ * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven @@ -43,7 +43,7 @@ Building: ### OSX Requirements: -* cmake 3.1 +* cmake 3.13+ * ninja * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven @@ -58,7 +58,7 @@ Building: ### Windows Requirements: * Visual Studio 2015 or above -* CMake 3.1 +* CMake 3.13+ * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven From 6c7d31849fa12c48f894e06cf4c9a59913dc4da9 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 14:23:14 -0700 Subject: [PATCH 04/25] update submodules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-s3 | 2 +- crt/aws-checksums | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index c5e7c618c..637fb73be 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit c5e7c618cd333367ec56173ead8b78e2672d085c +Subproject commit 637fb73beaea24bb1f27e5836854017cd9a9173f diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 2e64ddf7e..c88fac25c 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 2e64ddf7ef499f4f13edbf2d2c417842cb172764 +Subproject commit c88fac25c884cadad2a341ebf045e99742a259b3 diff --git a/crt/aws-c-common b/crt/aws-c-common index e9f38b9b2..08c5356b6 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit e9f38b9b211cbc3c22c901265f7ef27d43306b2b +Subproject commit 08c5356b674b642b430b0f9c3f72159626e1ba10 diff --git a/crt/aws-c-http b/crt/aws-c-http index 5d0447775..b88e37149 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 5d0447775c38c8dae44604fb781302c70419b816 +Subproject commit b88e37149f904176e0fffdfbd30854c595ece20f diff --git a/crt/aws-c-io b/crt/aws-c-io index 79d342f38..1755fd2e9 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 79d342f3874df776b7380c73e5ad3a856655220d +Subproject commit 1755fd2e9651494318799130b17eea6ea04671a9 diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index 54b3eec3e..5ccdb207f 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit 54b3eec3e48705cba82ae4af3df4f5440d1182b8 +Subproject commit 5ccdb207fd85921db4921846a4d2ac0e1d503b02 diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 7d359254b..e77b41178 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 7d359254be51634c7266c877535d6cd87a873f76 +Subproject commit e77b411787da795510f0aa0877525e544fe6ea57 diff --git a/crt/aws-checksums b/crt/aws-checksums index fb110ddbe..aa1f0672a 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit fb110ddbeed0e38fdbb3b025cef28ecd108bd142 +Subproject commit aa1f0672a1a9b87281e2455d28e9b80d80aa2fb2 diff --git a/crt/aws-lc b/crt/aws-lc index ec94d74a1..634f19ab6 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit ec94d74a19b5a0aa738b436a95bb06ff87fc7ba9 +Subproject commit 634f19ab6a4808fae59f3312ca397927653ee27f diff --git a/crt/s2n b/crt/s2n index 08d413a0b..ffe0bf42d 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 08d413a0b9b3226e775a38f04e3cf02230cc97c4 +Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb From d7010b348ddef394028b6112011fd0b29acf7b04 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 15:49:47 -0700 Subject: [PATCH 05/25] latest main commits --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-checksums | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 637fb73be..08fb6f71a 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 637fb73beaea24bb1f27e5836854017cd9a9173f +Subproject commit 08fb6f71a85f8c9522547af164d497c8fec4f2aa diff --git a/crt/aws-c-cal b/crt/aws-c-cal index c88fac25c..fdaef2ddf 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit c88fac25c884cadad2a341ebf045e99742a259b3 +Subproject commit fdaef2ddfb4cd5850231d9bd9d6e34e91b41c943 diff --git a/crt/aws-c-common b/crt/aws-c-common index 08c5356b6..d223f6009 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 08c5356b674b642b430b0f9c3f72159626e1ba10 +Subproject commit d223f6009ce979637d3c9e7d2f5f02af08497cc0 diff --git a/crt/aws-c-http b/crt/aws-c-http index b88e37149..7778cd991 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit b88e37149f904176e0fffdfbd30854c595ece20f +Subproject commit 7778cd99166087af36b3b1cdc687b57192952f0f diff --git a/crt/aws-c-io b/crt/aws-c-io index 1755fd2e9..05780b8af 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 1755fd2e9651494318799130b17eea6ea04671a9 +Subproject commit 05780b8af105ad7f68d17c3b8d1ddb81d773c6b7 diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index 5ccdb207f..40d6b2de8 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit 5ccdb207fd85921db4921846a4d2ac0e1d503b02 +Subproject commit 40d6b2de82ef5b2b95992584678279828d2f8af6 diff --git a/crt/aws-checksums b/crt/aws-checksums index aa1f0672a..38c5d4423 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit aa1f0672a1a9b87281e2455d28e9b80d80aa2fb2 +Subproject commit 38c5d44237413b241ae648e3becd47568e598061 From 3e0524a3fd512c52e2f5c6f2c7ce7aad453ac79c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 15:58:49 -0700 Subject: [PATCH 06/25] try version --- android/crt/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index 837c93082..0fb525410 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -68,6 +68,7 @@ android { externalNativeBuild { cmake { arguments "-DBUILD_DEPS=ON" + version "3.13.0+" } } } From 6267bd524123674752ebb7520534ceef8160040b Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 16:09:52 -0700 Subject: [PATCH 07/25] try 3.13 --- android/crt/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index 0fb525410..47fb56f3f 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -68,7 +68,6 @@ android { externalNativeBuild { cmake { arguments "-DBUILD_DEPS=ON" - version "3.13.0+" } } } @@ -104,7 +103,7 @@ android { cmake { path "../../CMakeLists.txt" buildStagingDirectory "../../target/cmake-build" - version "3.10.2" + version "3.13.0+" } } From cf246c587c9a3e03fd8225584263e17e1b9af41e Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 16:30:25 -0700 Subject: [PATCH 08/25] let's go all the way --- android/crt/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index 47fb56f3f..ff6050a76 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -103,7 +103,7 @@ android { cmake { path "../../CMakeLists.txt" buildStagingDirectory "../../target/cmake-build" - version "3.13.0+" + version "3.30.5" } } From f57bf9e71195e2ca5b4f9b89b52180b990b1e6ab Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 16:37:18 -0700 Subject: [PATCH 09/25] try again --- android/crt/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index ff6050a76..641680eee 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -103,7 +103,7 @@ android { cmake { path "../../CMakeLists.txt" buildStagingDirectory "../../target/cmake-build" - version "3.30.5" + version "3.30.4" } } From 9381723b899202f9435c22134551b4164f14046a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 16:41:46 -0700 Subject: [PATCH 10/25] install ninja-build? --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f8e33164..216802506 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -240,6 +240,7 @@ jobs: # Build and publish locally for the test app to find the SNAPSHOT version - name: Build ${{ env.PACKAGE_NAME }} run: | + sudo apt-get install ninja-build ./gradlew :android:crt:build ./gradlew -PnewVersion="1.0.0-SNAPSHOT" :android:crt:publishToMavenLocal # Setup files required by test app for Device Farm testing From c253b8e0b674070f56cca7c4425242b7f1881f7f Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 16 Oct 2024 16:48:55 -0700 Subject: [PATCH 11/25] update gradle --- android/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d70ad12a2..c16628d5c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.4.2' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fcea..b7f770f82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Oct 16 16:47:56 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 9531aef74bbe9075722991a6af74ab74dd58eee1 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 08:53:53 -0700 Subject: [PATCH 12/25] bump jvm size --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 216802506..3a5aa84d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -241,7 +241,7 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} run: | sudo apt-get install ninja-build - ./gradlew :android:crt:build + ./gradlew :android:crt:build -Dorg.gradle.jvmargs=-Xmx4g ./gradlew -PnewVersion="1.0.0-SNAPSHOT" :android:crt:publishToMavenLocal # Setup files required by test app for Device Farm testing - name: Setup Android Test Files From 146f47bd77edd410ebdcac715f2680cd4cb87a94 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 08:59:24 -0700 Subject: [PATCH 13/25] bump target SDK version to 33 --- android/crt/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index 641680eee..f31ae7bf4 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -43,7 +43,6 @@ ext { } android { - compileSdkVersion 30 buildToolsVersion "30.0.3" ndkVersion "21.4.7075529" // LTS version @@ -53,7 +52,9 @@ android { defaultConfig { minSdkVersion 24 // TODO - dictated by CompletableFuture which is API 24+ - targetSdkVersion 30 + targetSdkVersion 33 + compileSdk 33 + versionCode = gitVersionCode() versionName = gitVersionName() From 278ef242545316fbb110bf409d52eb43222bbd6a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 09:17:14 -0700 Subject: [PATCH 14/25] try latest sdk --- android/crt/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index f31ae7bf4..371bc55b9 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -43,7 +43,7 @@ ext { } android { - buildToolsVersion "30.0.3" + compileSdk 35 ndkVersion "21.4.7075529" // LTS version useLibrary 'android.test.runner' @@ -52,8 +52,7 @@ android { defaultConfig { minSdkVersion 24 // TODO - dictated by CompletableFuture which is API 24+ - targetSdkVersion 33 - compileSdk 33 + targetSdkVersion 35 versionCode = gitVersionCode() versionName = gitVersionName() From b4b65051b0a1fcaf7c0291cecf783b690f1ae40a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 09:20:59 -0700 Subject: [PATCH 15/25] revert to 33 working version, upgrade to 35 is for another day --- android/crt/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index 371bc55b9..c0bfc3e05 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -43,7 +43,7 @@ ext { } android { - compileSdk 35 + compileSdk 33 ndkVersion "21.4.7075529" // LTS version useLibrary 'android.test.runner' @@ -52,7 +52,7 @@ android { defaultConfig { minSdkVersion 24 // TODO - dictated by CompletableFuture which is API 24+ - targetSdkVersion 35 + targetSdkVersion 33 versionCode = gitVersionCode() versionName = gitVersionName() From 17393efac68de4c4764c319f7156074ee1fb6dc0 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 09:24:18 -0700 Subject: [PATCH 16/25] Without explicit version? --- android/crt/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/android/crt/build.gradle b/android/crt/build.gradle index c0bfc3e05..f5b7f3f93 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -103,7 +103,6 @@ android { cmake { path "../../CMakeLists.txt" buildStagingDirectory "../../target/cmake-build" - version "3.30.4" } } From 2a39bc0ce4c32962974c137956c264e47eab947e Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 10:35:27 -0700 Subject: [PATCH 17/25] do we need ninja --- .github/workflows/ci.yml | 3 +-- codebuild/cd/deploy-snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a5aa84d5..706918f85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -240,8 +240,7 @@ jobs: # Build and publish locally for the test app to find the SNAPSHOT version - name: Build ${{ env.PACKAGE_NAME }} run: | - sudo apt-get install ninja-build - ./gradlew :android:crt:build -Dorg.gradle.jvmargs=-Xmx4g + ./gradlew :android:crt:build ./gradlew -PnewVersion="1.0.0-SNAPSHOT" :android:crt:publishToMavenLocal # Setup files required by test app for Device Farm testing - name: Setup Android Test Files diff --git a/codebuild/cd/deploy-snapshot.yml b/codebuild/cd/deploy-snapshot.yml index b43e3ccb4..42a3c2466 100644 --- a/codebuild/cd/deploy-snapshot.yml +++ b/codebuild/cd/deploy-snapshot.yml @@ -16,7 +16,7 @@ phases: # This weird path needed for cmd tool to work - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest # install android build tools - - echo y | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "build-tools;30.0.3" "platforms;android-30" "ndk;21.4.7075529" + - echo y | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install "build-tools;30.0.3" "platforms;android-33" "ndk;21.4.7075529" pre_build: commands: From 73440c7aba09224d80bc323c0bc971511aa0f562 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 11:33:32 -0700 Subject: [PATCH 18/25] try bool instead of _Bool --- .github/workflows/ci.yml | 2 +- crt/aws-c-io | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 706918f85..8f8e33164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -240,7 +240,7 @@ jobs: # Build and publish locally for the test app to find the SNAPSHOT version - name: Build ${{ env.PACKAGE_NAME }} run: | - ./gradlew :android:crt:build + ./gradlew :android:crt:build ./gradlew -PnewVersion="1.0.0-SNAPSHOT" :android:crt:publishToMavenLocal # Setup files required by test app for Device Farm testing - name: Setup Android Test Files diff --git a/crt/aws-c-io b/crt/aws-c-io index 05780b8af..b30d93ed9 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 05780b8af105ad7f68d17c3b8d1ddb81d773c6b7 +Subproject commit b30d93ed9fef629088db61d0f7867e1193b86389 From 2751cc542357aca0f75358feb94bff2209b0fd06 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 11:38:34 -0700 Subject: [PATCH 19/25] no fail fast --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f8e33164..81a6ecce8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,6 +72,7 @@ jobs: name: ARM (${{ matrix.arch }}) runs-on: ubuntu-22.04 # latest strategy: + fail-fast: false matrix: arch: [armv6, armv7, arm64] steps: From fb81a07b8ba525ec56cd97ff435806916452bf5d Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 14:39:00 -0700 Subject: [PATCH 20/25] fix bool? --- crt/aws-c-io | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-io b/crt/aws-c-io index b30d93ed9..4f05432de 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit b30d93ed9fef629088db61d0f7867e1193b86389 +Subproject commit 4f05432de1a3119b073d8e8d5a9cce5f2a2946f4 From 253a77c9e6c71a6148e935e0de0a408f821e9f85 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 14:45:13 -0700 Subject: [PATCH 21/25] fix win --- crt/aws-c-io | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-io b/crt/aws-c-io index 4f05432de..954430037 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 4f05432de1a3119b073d8e8d5a9cce5f2a2946f4 +Subproject commit 9544300375b0583ed68f87c2e987d2a990b896a6 From 22543176d928380296f96716d566bd26c50b348d Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Thu, 17 Oct 2024 15:07:29 -0700 Subject: [PATCH 22/25] no longer needed --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81a6ecce8..f3ce5d496 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,6 @@ jobs: raspberry: runs-on: ubuntu-22.04 # latest strategy: - fail-fast: false matrix: image: - raspbian-bullseye From c77f60c833931c5c36e8deee3c27028c50b8401a Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Fri, 18 Oct 2024 12:05:06 -0700 Subject: [PATCH 23/25] 39 --- CMakeLists.txt | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dce08261d..53647b365 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.9) project(aws-crt-jni C) option(BUILD_DEPS "Builds aws common runtime dependencies as part of build" ON) diff --git a/README.md b/README.md index a753a81ed..e4d162f1f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This library is licensed under the Apache 2.0 License. ### Linux/Unix Requirements: * Clang 3.9+ or GCC 4.4+ -* cmake 3.13+ +* cmake 3.9+ * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven @@ -43,7 +43,7 @@ Building: ### OSX Requirements: -* cmake 3.13+ +* cmake 3.9+ * ninja * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven @@ -58,7 +58,7 @@ Building: ### Windows Requirements: * Visual Studio 2015 or above -* CMake 3.13+ +* CMake 3.9+ * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven From 2e93943a2d1686129cf1fd8563a08853dd4e0346 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Fri, 18 Oct 2024 12:05:40 -0700 Subject: [PATCH 24/25] revert policy --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53647b365..47a1b8200 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ project(aws-crt-jni C) option(BUILD_DEPS "Builds aws common runtime dependencies as part of build" ON) option(CRT_FIPS "Whether to build aws-lc with FIPS compliance" OFF) +if (POLICY CMP0077) + cmake_policy(SET CMP0077 NEW) # Enable options to get their values from normal variables +endif() if (DEFINED CMAKE_PREFIX_PATH) file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) From 5f0ec98cdb04af3b8f0b153cb1077e4cf40ba713 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 23 Oct 2024 10:06:48 -0700 Subject: [PATCH 25/25] latest submodules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-s3 | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 08fb6f71a..3982bd75f 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 08fb6f71a85f8c9522547af164d497c8fec4f2aa +Subproject commit 3982bd75fea74efd8f9b462b27fedd4599db4f53 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index fdaef2ddf..656762aef 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit fdaef2ddfb4cd5850231d9bd9d6e34e91b41c943 +Subproject commit 656762aefbee2bc8f509cb23cd107abff20a72bb diff --git a/crt/aws-c-common b/crt/aws-c-common index d223f6009..f41b772f0 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit d223f6009ce979637d3c9e7d2f5f02af08497cc0 +Subproject commit f41b772f0de9454a4e7a65750b58c2379533bbf1 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ff2120184..c6c1191e5 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ff21201842dee4a30563c424f5f753bbef3f648e +Subproject commit c6c1191e525e5aa6ead9e1afc392e35d3b50331e diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 305f71f94..d2dcc9344 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 305f71f94ac401a51c53ddcd05c454472e7f18ab +Subproject commit d2dcc9344dae24de320866045d85166d8a91a0d1 diff --git a/crt/aws-c-http b/crt/aws-c-http index 7778cd991..74b3a0dd1 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 7778cd99166087af36b3b1cdc687b57192952f0f +Subproject commit 74b3a0dd1396b72f701c8bdf24e5c6f41e52cf87 diff --git a/crt/aws-c-io b/crt/aws-c-io index 954430037..fe93d0afc 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 9544300375b0583ed68f87c2e987d2a990b896a6 +Subproject commit fe93d0afcc1cede32ac9569abd8669ed011b1b8c diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index 40d6b2de8..627c3334e 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit 40d6b2de82ef5b2b95992584678279828d2f8af6 +Subproject commit 627c3334e52021aa8d5772b6ca076884610f3219 diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index e77b41178..8c1969bce 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit e77b411787da795510f0aa0877525e544fe6ea57 +Subproject commit 8c1969bce5bfe0e063cbc719182dbe344342b880 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index f3f6cd10e..0818f28ee 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit f3f6cd10e0f8352640f557174a5ef3c62d5f6147 +Subproject commit 0818f28ee436b892f09fbe8e3a6ae37ff40e9436 diff --git a/crt/aws-checksums b/crt/aws-checksums index 38c5d4423..0d2f5521f 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit 38c5d44237413b241ae648e3becd47568e598061 +Subproject commit 0d2f5521f61215f38f791d106ae304402208112d