diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f8e33164..f3ce5d496 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: @@ -150,7 +151,6 @@ jobs: raspberry: runs-on: ubuntu-22.04 # latest strategy: - fail-fast: false matrix: image: - raspbian-bullseye diff --git a/CMakeLists.txt b/CMakeLists.txt index 8771c8ba9..47a1b8200 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,9 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.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 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() diff --git a/README.md b/README.md index 246f8f2d4..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.1+ +* cmake 3.9+ * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven @@ -43,7 +43,7 @@ Building: ### OSX Requirements: -* cmake 3.1 +* 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.1 +* CMake 3.9+ * Java: Any JDK8 or above, ensure `JAVA_HOME` is set * Maven 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/android/crt/build.gradle b/android/crt/build.gradle index 837c93082..f5b7f3f93 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -43,8 +43,7 @@ ext { } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdk 33 ndkVersion "21.4.7075529" // LTS version useLibrary 'android.test.runner' @@ -53,7 +52,8 @@ android { defaultConfig { minSdkVersion 24 // TODO - dictated by CompletableFuture which is API 24+ - targetSdkVersion 30 + targetSdkVersion 33 + versionCode = gitVersionCode() versionName = gitVersionName() @@ -103,7 +103,6 @@ android { cmake { path "../../CMakeLists.txt" buildStagingDirectory "../../target/cmake-build" - version "3.10.2" } } 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: diff --git a/crt/aws-c-auth b/crt/aws-c-auth index d5e6eb03b..3982bd75f 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit d5e6eb03b5dc36845cc44995c6afbbce19a287af +Subproject commit 3982bd75fea74efd8f9b462b27fedd4599db4f53 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 2cb1d2eac..656762aef 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 2cb1d2eac925e2dbc45025eb89af82bd790c23a0 +Subproject commit 656762aefbee2bc8f509cb23cd107abff20a72bb diff --git a/crt/aws-c-common b/crt/aws-c-common index b9959f592..f41b772f0 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c +Subproject commit f41b772f0de9454a4e7a65750b58c2379533bbf1 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index f36d01672..c6c1191e5 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit f36d01672d61e49d96a777870d456f66fa391cd4 +Subproject commit c6c1191e525e5aa6ead9e1afc392e35d3b50331e diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 1b3825fc9..d2dcc9344 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 1b3825fc9cae2e9c7ed7479ee5d354d52ebdf7a0 +Subproject commit d2dcc9344dae24de320866045d85166d8a91a0d1 diff --git a/crt/aws-c-http b/crt/aws-c-http index 6068653e1..74b3a0dd1 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit 6068653e1d582bd8e7d1c9f81f86beaf10444e3d +Subproject commit 74b3a0dd1396b72f701c8bdf24e5c6f41e52cf87 diff --git a/crt/aws-c-io b/crt/aws-c-io index c345d7727..fe93d0afc 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2 +Subproject commit fe93d0afcc1cede32ac9569abd8669ed011b1b8c diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index c43232c1b..627c3334e 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit c43232c1bc378344bb7245d7fcb167410f3fe931 +Subproject commit 627c3334e52021aa8d5772b6ca076884610f3219 diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 502cd6249..8c1969bce 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 502cd6249c6523583c19b122c65e02cf74301b3e +Subproject commit 8c1969bce5bfe0e063cbc719182dbe344342b880 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 4658412a6..0818f28ee 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 4658412a61ad5749db92a8d1e0717cb5e76ada1c +Subproject commit 0818f28ee436b892f09fbe8e3a6ae37ff40e9436 diff --git a/crt/aws-checksums b/crt/aws-checksums index ce04ab00b..0d2f5521f 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit ce04ab00b3ecc41912f478bfedca39f8e1919d6b +Subproject commit 0d2f5521f61215f38f791d106ae304402208112d 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 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