Merge branch 'main' into add-gg-ci-job

aws · May 31, 2024 · b5b8a56 · b5b8a56
2 parents 50af896 + 681996a
commit b5b8a56
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -212,10 +212,13 @@ jobs:
         python ./deviceadvisor/script/DATestRun.py
 
   osx:
-    runs-on: macos-latest
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
+        runner:
+          - macos-13
+          - macos-latest
         version:
           - 8
           - 11
@@ -253,6 +256,8 @@ jobs:
         source utils/mqtt5_test_setup.sh s3://iot-sdk-ci-bucket-us-east1/IotUsProdMqtt5EnvironmentVariables.txt cleanup
     - name: Running samples in CI setup
       run: |
+        python3 -m venv .venv
+        source .venv/bin/activate
         python3 -m pip install boto3
         mvn install -Dmaven.test.skip=true
     - name: configure AWS credentials (PubSub)
@@ -262,13 +267,15 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run PubSub sample
       run: |
+        source .venv/bin/activate
         python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pubsub_cfg.json
     - name: run PKCS12 Connect sample
       run: |
         cert=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/cert" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$cert" > /tmp/certificate.pem
         key=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$key" > /tmp/privatekey.pem
         pkcs12_password=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key_pkcs12_password" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\")
         openssl pkcs12 -export -in /tmp/certificate.pem -inkey /tmp/privatekey.pem -out ./pkcs12-key.p12 -name PubSub_Thing_Alias -password pass:$pkcs12_password
+        source .venv/bin/activate
         python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pkcs12_connect_cfg.json
     - name: configure AWS credentials (MQTT5)
       uses: aws-actions/configure-aws-credentials@v2
@@ -277,6 +284,7 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run MQTT5 PubSub sample
       run: |
+        source .venv/bin/activate
         python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_mqtt5_pubsub_cfg.json
     - name: configure AWS credentials (Device Advisor)
       uses: aws-actions/configure-aws-credentials@v2
@@ -285,6 +293,7 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run DeviceAdvisor
       run: |
+        source .venv/bin/activate
         python3 ./deviceadvisor/script/DATestRun.py
 
   java-compat:

diff --git a/README.md b/README.md
@@ -38,11 +38,11 @@ Consuming this SDK via Maven is the preferred method of consuming it and using i
 <dependency>
   <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
   <artifactId>aws-iot-device-sdk</artifactId>
-  <version>1.20.5</version>
+  <version>1.20.7</version>
 </dependency>
 ```
 
-Replace `1.20.5` in `<version>1.20.5</version>` with the latest release version for the SDK.
+Replace `1.20.7` in `<version>1.20.7</version>` with the latest release version for the SDK.
 Look up the latest SDK version here: https://github.com/aws/aws-iot-device-sdk-java-v2/releases
 
 ### Build IoT Device SDK from source
@@ -95,4 +95,4 @@ is provided by code that been generated from a model of the service.
 
 This library is licensed under the [Apache 2.0 License](./documents/LICENSE).
 
-Latest released version: v1.20.5
+Latest released version: v1.20.7
diff --git a/android/iotdevicesdk/build.gradle b/android/iotdevicesdk/build.gradle
@@ -97,7 +97,7 @@ repositories {
 }
 
 dependencies {
-    api 'software.amazon.awssdk.crt:aws-crt-android:0.29.18'
+    api 'software.amazon.awssdk.crt:aws-crt-android:0.29.19'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
     implementation 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.google.code.gson:gson:2.9.0'

diff --git a/documents/ANDROID.md b/documents/ANDROID.md
@@ -52,8 +52,8 @@ a dependency of the aws-iot-device-sdk-android library.
 mkdir sdk-workspace
 cd sdk-workspace
 # Clone the SDK repository
-# (Use the latest version of the SDK here instead of `v1.20.5`)
-git clone --branch v1.20.5 --recurse-submodules https://github.com/aws/aws-iot-device-sdk-java-v2.git
+# (Use the latest version of the SDK here instead of `v1.20.7`)
+git clone --branch v1.20.7 --recurse-submodules https://github.com/aws/aws-iot-device-sdk-java-v2.git
 # Compile and install the SDK for Android
 cd aws-iot-device-sdk-java-v2/android
 ./gradlew build
@@ -74,10 +74,10 @@ repositories {
 }
 
 dependencies {
-    api 'software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.5'
+    api 'software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.7'
 }
 ```
-Replace `1.20.5` in `software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.5` with the latest release version for the SDK.
+Replace `1.20.7` in `software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.7` with the latest release version for the SDK.
 Look up the latest SDK version here: https://github.com/aws/aws-iot-device-sdk-java-v2/releases
 
 ### Consuming from locally installed
@@ -89,10 +89,10 @@ repositories {
 }
 
 dependencies {
-    api 'software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.5'
+    api 'software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.7'
 }
 ```
-Replace `1.20.5` in `software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.5` with the latest release version for the SDK
+Replace `1.20.7` in `software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.7` with the latest release version for the SDK
 or replace with `1.0.0-SNAPSHOT` to use the SDK built and installed from source.
 Look up the latest SDK version here: https://github.com/aws/aws-iot-device-sdk-java-v2/releases
 

diff --git a/samples/Android/AndroidKeyChainPubSub/src/main/java/androidkeychainpubsub/pom.xml b/samples/Android/AndroidKeyChainPubSub/src/main/java/androidkeychainpubsub/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Android/app/build.gradle b/samples/Android/app/build.gradle
@@ -61,7 +61,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api 'software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.5'
+    api 'software.amazon.awssdk.iotdevicesdk:aws-iot-device-sdk-android:1.20.7'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core:1.2.0'

diff --git a/samples/BasicConnect/pom.xml b/samples/BasicConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/BasicPubSub/pom.xml b/samples/BasicPubSub/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/CognitoConnect/pom.xml b/samples/CognitoConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/CustomAuthorizerConnect/pom.xml b/samples/CustomAuthorizerConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/CustomKeyOpsConnect/pom.xml b/samples/CustomKeyOpsConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/FleetProvisioning/pom.xml b/samples/FleetProvisioning/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Greengrass/pom.xml b/samples/Greengrass/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/GreengrassIPC/pom.xml b/samples/GreengrassIPC/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/JavaKeystoreConnect/pom.xml b/samples/JavaKeystoreConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Jobs/pom.xml b/samples/Jobs/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Mqtt5/PubSub/pom.xml b/samples/Mqtt5/PubSub/pom.xml
@@ -27,7 +27,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Mqtt5/SharedSubscription/pom.xml b/samples/Mqtt5/SharedSubscription/pom.xml
@@ -27,7 +27,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Pkcs11Connect/pom.xml b/samples/Pkcs11Connect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Pkcs12Connect/pom.xml b/samples/Pkcs12Connect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/Shadow/pom.xml b/samples/Shadow/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/WebsocketConnect/pom.xml b/samples/WebsocketConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/WindowsCertConnect/pom.xml b/samples/WindowsCertConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/samples/X509CredentialsProviderConnect/pom.xml b/samples/X509CredentialsProviderConnect/pom.xml
@@ -20,7 +20,7 @@
                 <dependency>
                     <groupId>software.amazon.awssdk.iotdevicesdk</groupId>
                     <artifactId>aws-iot-device-sdk</artifactId>
-                    <version>1.20.5</version>
+                    <version>1.20.7</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>software.amazon.awssdk.crt</groupId>
       <artifactId>aws-crt</artifactId>
-      <version>0.29.18</version>
+      <version>0.29.19</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>