Update CMake to 3.9 (#837)

Co-authored-by: Michael Graeb <graebm@amazon.com>
awslabs · Oct 23, 2024 · 69d43f3 · 69d43f3
1 parent 28928d4
commit 69d43f3
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
diff --git a/crt/aws-checksums b/crt/aws-checksums
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n
diff --git 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