Revert "Add TLS ALPN support for AWS IoT MQTT connections (#779)"

This reverts commit 753ef9f.

Author: desokroshan

.circleci/config.yml

@@ -968,7 +968,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: apigateway
           testmodule: aws-android-sdk-apigateway-test
@@ -998,7 +998,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop              
       - integrationtest:
           name: comprehend
           testmodule: aws-android-sdk-comprehend-test
@@ -1041,14 +1041,14 @@ workflows:
                 - develop
       - integrationtest:
           name: iot
-          testmodule: aws-android-sdk-iot
+          testmodule: aws-android-sdk-iot-test
           requires:
             - pre_integrationtest    
           filters:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: kinesis
           testmodule: aws-android-sdk-kinesis-test
@@ -1069,6 +1069,7 @@ workflows:
               only:
                 - master
                 - develop
+
       - integrationtest:
           name: polly
           testmodule: aws-android-sdk-polly-test
@@ -1108,7 +1109,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop                                 
       - integrationtest:
           name: ses
           testmodule: aws-android-sdk-ses-test
@@ -1118,7 +1119,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop                                 
       - integrationtest:
           name: sns
           testmodule: aws-android-sdk-sns-test
@@ -1128,7 +1129,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: sqs
           testmodule: aws-android-sdk-sqs-test
@@ -1138,7 +1139,8 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
+
       - integrationtest:
           name: transcribe
           testmodule: aws-android-sdk-transcribe-test
@@ -1148,7 +1150,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: translate
           testmodule: aws-android-sdk-translate-test
@@ -1158,7 +1160,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: mobile-client
           testmodule: aws-android-sdk-mobile-client
@@ -1168,7 +1170,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: CognitoIdentityProvider
           testmodule: aws-android-sdk-cognitoidentityprovider-test
@@ -1178,7 +1180,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: Core
           testmodule: aws-android-sdk-core-test
@@ -1188,7 +1190,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop 
       - integrationtest:
           name: CognitoAuth
           testmodule: aws-android-sdk-cognitoauth
@@ -1198,7 +1200,7 @@ workflows:
             branches:
               only:
                 - master
-                - develop
+                - develop              
       # - integrationtest:
       #     name: kinesisvideo
       #     testmodule: aws-android-sdk-kinesisvideo
@@ -1218,7 +1220,7 @@ workflows:
       #       branches:
       #         only:
       #           - master
-      #           - develop
+      #           - develop         
       # - integrationtest:
       #     name: kinesisvideo-archivedmedia
       #     testmodule: aws-android-sdk-kinesisvideo-archivedmedia
@@ -1228,7 +1230,7 @@ workflows:
       #       branches:
       #         only:
       #           - master
-      #           - develop
+      #           - develop                    
       - post_integrationtest:
           requires:
             # - kinesisvideo-archivedmedia
@@ -1385,7 +1387,7 @@ workflows:
               only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/  
       - integrationtest:
           name: iot
-          testmodule: aws-android-sdk-iot
+          testmodule: aws-android-sdk-iot-test
           requires:
             - pre_integrationtest    
           filters:

CHANGELOG.md

@@ -1,12 +1,6 @@
 # Change Log - AWS SDK for Android
 
-## [Release 2.13.0](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.13.0)
-
-### Enhancements
-
-* **AWS IoT**
-  * AWS IoT SDK for Android now supports MQTT over TLS with X.509 client certificate authentication on port 443. Previously this combination of protocol and authentication mechanism was only supported on port 8883. `connectUsingALPN()` method allows developers to connect to AWS IoT using client certificate authentication on port 443. Please look at [this blog](https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/) for more details.
-  * **Breaking Change:** Please note that the type of aws-android-sdk-iot artifact is being changed from a`jar` to an `aar`. Also note that the `aar` artifacts needs to be explicitly specified in the dependency as `implementation ("com.amazonaws:aws-android-sdk-iot:2.12.+@aar") { transitive =true }` on some of the older versions of gradle.
+## [Release 2.12.7](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.7)
 
 ### Enhancements
 

aws-android-sdk-iot-test/build.gradle

@@ -0,0 +1,45 @@
+apply plugin: 'com.android.library'
+repositories {
+    google()
+    mavenCentral()
+}
+
+android {
+    compileSdkVersion 27
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    api (project(":aws-android-sdk-iot")){
+        exclude group: "com.google.android", module: "android"
+    }
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation project(":aws-android-sdk-testutils")
+    androidTestImplementation "org.robolectric:robolectric:2.4"
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+
+}

aws-android-sdk-iot-test/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

aws-android-sdk-iot/src/androidTest/java/com/amazonaws/mobileconnectors/iot/IoTIntegrationTestBase.java renamed to aws-android-sdk-iot-test/src/androidTest/java/com/amazonaws/mobileconnectors/iot/IoTIntegrationTestBase.java

@@ -17,7 +17,7 @@
 
 import android.support.test.InstrumentationRegistry;
 
-import com.amazonaws.iot.R;
+import com.amazonaws.iottest.R;
 import com.amazonaws.testutils.AWSTestBase;
 
 import org.json.JSONObject;