-
Notifications
You must be signed in to change notification settings - Fork 39
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.
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
Update CMake to 3.9 #837
Update CMake to 3.9 #837
Changes from all commits
fb572f6
0bf7f17
90a0ba6
d67615d
6c7d318
d7010b3
3e0524a
6267bd5
cf246c5
f57bf9e
9381723
c253b8e
9531aef
146f47b
278ef24
b4b6505
17393ef
2a39bc0
73440c7
2751cc5
fb81a07
253a77c
2254317
c77f60c
2e93943
5f0ec98
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,8 +43,7 @@ ext { | |
} | ||
|
||
android { | ||
compileSdkVersion 30 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. compileSdkVersion is deprecated and replaced by compileSdk |
||
buildToolsVersion "30.0.3" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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' | ||
|
@@ -53,7 +52,8 @@ android { | |
|
||
defaultConfig { | ||
minSdkVersion 24 // TODO - dictated by CompletableFuture which is API 24+ | ||
targetSdkVersion 30 | ||
targetSdkVersion 33 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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() | ||
|
||
|
@@ -103,7 +103,6 @@ android { | |
cmake { | ||
path "../../CMakeLists.txt" | ||
buildStagingDirectory "../../target/cmake-build" | ||
version "3.10.2" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
} | ||
} | ||
|
||
|
+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 |
+1 −5 | CMakeLists.txt | |
+1 −1 | README.md | |
+2 −2 | source/h1_connection.c | |
+1 −1 | source/http.c |
+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 |
+17 −15 | CMakeLists.txt | |
+3 −3 | README.md | |
+3 −0 | include/aws/mqtt/mqtt.h | |
+10 −1 | source/mqtt.c |
+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 | |
+7 −6 | include/aws/s3/s3_client.h | |
+1 −0 | source/s3.c | |
+1 −0 | source/s3_buffer_pool.c | |
+55 −39 | 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 | |
+99 −21 | source/s3_request_messages.c | |
+5 −0 | source/s3_util.c | |
+9 −0 | tests/CMakeLists.txt | |
+15 −0 | tests/mock_s3_server/CreateMultipartUpload/request_timeout.json | |
+1 −0 | tests/s3_buffer_pool_tests.c | |
+153 −244 | tests/s3_data_plane_tests.c | |
+57 −6 | tests/s3_mock_server_tests.c | |
+44 −0 | tests/s3_s3express_client_test.c | |
+261 −1 | tests/s3_tester.c | |
+28 −0 | tests/s3_tester.h | |
+4 −0 | tests/test_helper/README.md | |
+4 −5 | tests/test_helper/test_helper.py |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
#Wed Oct 16 16:47:56 PDT 2024 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
There was a problem hiding this comment.
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.