Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CMake to 3.9 #837

Merged
merged 26 commits into from
Oct 23, 2024
Merged

Update CMake to 3.9 #837

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fb572f6
Update required CMake
graebm Aug 19, 2024
0bf7f17
latest
graebm Aug 23, 2024
90a0ba6
Merge branch 'main' into update-cmake
graebm Oct 14, 2024
d67615d
update readme
graebm Oct 14, 2024
6c7d318
update submodules
waahm7 Oct 16, 2024
d7010b3
latest main commits
waahm7 Oct 16, 2024
3e0524a
try version
waahm7 Oct 16, 2024
6267bd5
try 3.13
waahm7 Oct 16, 2024
cf246c5
let's go all the way
waahm7 Oct 16, 2024
f57bf9e
try again
waahm7 Oct 16, 2024
9381723
install ninja-build?
waahm7 Oct 16, 2024
c253b8e
update gradle
waahm7 Oct 16, 2024
9531aef
bump jvm size
waahm7 Oct 17, 2024
146f47b
bump target SDK version to 33
waahm7 Oct 17, 2024
278ef24
try latest sdk
waahm7 Oct 17, 2024
b4b6505
revert to 33 working version, upgrade to 35 is for another day
waahm7 Oct 17, 2024
17393ef
Without explicit version?
waahm7 Oct 17, 2024
2a39bc0
do we need ninja
waahm7 Oct 17, 2024
73440c7
try bool instead of _Bool
waahm7 Oct 17, 2024
2751cc5
no fail fast
waahm7 Oct 17, 2024
fb81a07
fix bool?
waahm7 Oct 17, 2024
253a77c
fix win
waahm7 Oct 17, 2024
2254317
no longer needed
waahm7 Oct 17, 2024
c77f60c
39
waahm7 Oct 18, 2024
2e93943
revert policy
waahm7 Oct 18, 2024
5f0ec98
latest submodules
waahm7 Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -150,7 +151,6 @@ jobs:
raspberry:
runs-on: ubuntu-22.04 # latest
strategy:
fail-fast: false
matrix:
image:
- raspbian-bullseye
Expand Down
9 changes: 1 addition & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gradle 7.0 had a bug with multiple object files which we were running into. Updating to 7.4 seems to work. 7.4 was chosen randomly.

}
}

Expand Down
7 changes: 3 additions & 4 deletions android/crt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ ext {
}

android {
compileSdkVersion 30
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compileSdkVersion is deprecated and replaced by compileSdk

buildToolsVersion "30.0.3"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildToolsVersion is deprecated and we don't need to specify it.

compileSdk 33
ndkVersion "21.4.7075529" // LTS version

useLibrary 'android.test.runner'
Expand All @@ -53,7 +52,8 @@ android {

defaultConfig {
minSdkVersion 24 // TODO - dictated by CompletableFuture which is API 24+
targetSdkVersion 30
targetSdkVersion 33
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was complaining that targetSDK 30 is not supported, and the minimum version should be 33 if you want to submit apps to Google Play. While we don't need to submit it to Google Play, 33 seems to work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not updating the minSdkVersion, so we should be fine.


versionCode = gitVersionCode()
versionName = gitVersionName()

Expand Down Expand Up @@ -103,7 +103,6 @@ android {
cmake {
path "../../CMakeLists.txt"
buildStagingDirectory "../../target/cmake-build"
version "3.10.2"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work without an explicit version. If we face any issues, we can revert back to an explicit version.

}
}

Expand Down
2 changes: 1 addition & 1 deletion codebuild/cd/deploy-snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-auth
Open in desktop
Submodule aws-c-auth updated 8 files
+1 −0 .gitignore
+1 −5 CMakeLists.txt
+2 −2 README.md
+2 −2 include/aws/auth/private/credentials_utils.h
+49 −7 source/credentials_utils.c
+2 −0 tests/CMakeLists.txt
+57 −57 tests/credentials_provider_sts_tests.c
+58 −0 tests/credentials_utils_tests.c
2 changes: 1 addition & 1 deletion crt/aws-c-cal
Open in desktop
Submodule aws-c-cal updated 2 files
+2 −6 CMakeLists.txt
+1 −1 README.md
2 changes: 1 addition & 1 deletion crt/aws-c-common
Open in desktop
Submodule aws-c-common updated 8 files
+1 −1 AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+1 −10 CMakeLists.txt
+8 −9 cmake/AwsCFlags.cmake
+11 −7 cmake/AwsPrebuildDependency.cmake
+2 −1 cmake/AwsSIMD.cmake
+3 −10 cmake/AwsTestHarness.cmake
+9 −4 include/aws/common/condition_variable.h
+5 −6 tests/memtrace_test.c
2 changes: 1 addition & 1 deletion crt/aws-c-compression
Open in desktop
Submodule aws-c-compression updated 1 files
+1 −5 CMakeLists.txt
2 changes: 1 addition & 1 deletion crt/aws-c-event-stream
Open in desktop
Submodule aws-c-event-stream updated 2 files
+1 −1 CMakeLists.txt
+1 −1 README.md
2 changes: 1 addition & 1 deletion crt/aws-c-http
Open in desktop
Submodule aws-c-http updated 4 files
+1 −5 CMakeLists.txt
+1 −1 README.md
+2 −2 source/h1_connection.c
+1 −1 source/http.c
2 changes: 1 addition & 1 deletion crt/aws-c-io
Open in desktop
Submodule aws-c-io updated 11 files
+16 −9 CMakeLists.txt
+1 −1 README.md
+5 −0 include/aws/io/socket.h
+13 −54 source/future.c
+10 −1 source/posix/socket.c
+8 −2 source/s2n/s2n_tls_channel_handler.c
+6 −0 source/windows/iocp/socket.c
+24 −0 source/windows/windows_pki_utils.c
+2 −0 tests/CMakeLists.txt
+14 −0 tests/socket_test.c
+36 −0 tests/tls_handler_test.c
2 changes: 1 addition & 1 deletion crt/aws-c-mqtt
Open in desktop
Submodule aws-c-mqtt updated 4 files
+17 −15 CMakeLists.txt
+3 −3 README.md
+3 −0 include/aws/mqtt/mqtt.h
+10 −1 source/mqtt.c
2 changes: 1 addition & 1 deletion crt/aws-c-s3
Open in desktop
Submodule aws-c-s3 updated 24 files
+1 −1 .github/workflows/ci.yml
+3 −0 .gitignore
+1 −5 CMakeLists.txt
+1 −1 README.md
+8 −0 include/aws/s3/private/s3_meta_request_impl.h
+1 −0 include/aws/s3/s3.h
+1 −0 include/aws/s3/s3_client.h
+1 −0 source/s3.c
+1 −0 source/s3_buffer_pool.c
+55 −33 source/s3_client.c
+25 −1 source/s3_copy_object.c
+186 −186 source/s3_endpoint_resolver/aws_s3_endpoint_resolver_partition.c
+16 −4 source/s3_meta_request.c
+5 −0 source/s3_util.c
+5 −0 tests/CMakeLists.txt
+15 −0 tests/mock_s3_server/CreateMultipartUpload/request_timeout.json
+1 −0 tests/s3_buffer_pool_tests.c
+101 −236 tests/s3_data_plane_tests.c
+57 −6 tests/s3_mock_server_tests.c
+44 −0 tests/s3_s3express_client_test.c
+258 −0 tests/s3_tester.c
+27 −0 tests/s3_tester.h
+4 −0 tests/test_helper/README.md
+4 −5 tests/test_helper/test_helper.py
2 changes: 1 addition & 1 deletion crt/aws-c-sdkutils
Open in desktop
Submodule aws-c-sdkutils updated 2 files
+1 −5 CMakeLists.txt
+2 −2 README.md
2 changes: 1 addition & 1 deletion crt/aws-checksums
Open in desktop
Submodule aws-checksums updated 1 files
+1 −6 CMakeLists.txt
2 changes: 1 addition & 1 deletion crt/aws-lc
Open in desktop
Submodule aws-lc updated from ec94d7 to 634f19
2 changes: 1 addition & 1 deletion crt/s2n
Open in desktop
Submodule s2n updated from 08d413 to ffe0bf
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Wed Oct 16 16:47:56 PDT 2024
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was automatically updated by Android Studio after updating Gradle to 7.4

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
Loading