diff --git a/README.md b/README.md index 0195d3857..3de934feb 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ mvn install ``` ## Build CRT from source -``` +```sh # NOTE: use the latest version of the CRT here -git clone --branch v0.5.1 https://github.com/awslabs/aws-crt-java.git +git clone --branch v0.5.4 https://github.com/awslabs/aws-crt-java.git git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git cd aws-crt-java mvn install -Dmaven.test.skip=true @@ -48,6 +48,34 @@ cd ../aws-iot-device-sdk-java-v2 mvn install ``` +### Android +Supports API 26 or newer. +NOTE: The shadow sample does not currently complete on android due to its dependence on stdin keyboard input. +```sh +git clone --branch v0.5.4 https://github.com/awslabs/aws-crt-java.git +git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git +cd aws-crt-java/android +./gradlew connectedCheck # optional, will run the unit tests on any connected devices/emulators +./gradlew publishToMavenLocal +cd ../aws-iot-device-sdk-java-v2/android +./gradlew publishToMavenLocal +./gradlew installDebug # optional, will install the IoTSamples app to any connected devices/emulators +``` + +Add the following to your project's build.gradle: +```groovy +repositories { + mavenCentral() + maven { + url System.getenv('HOME') + "/.m2/repository" + } +} + +dependencies { + implementation 'software.amazon.awssdk.crt:android:0.5.4' +} +``` + # Samples ## Shadow diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..603b14077 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 000000000..aea53be8d --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,63 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "software.amazon.awssdk.iotsamples" + minSdkVersion 26 + targetSdkVersion 29 + ndkVersion "21.0.6113669" + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + sourceSets { + main { + java.srcDir '../../sdk/src/main/java' + java.srcDir '../../samples/BasicPubSub/src/main/java' + java.srcDir '../../samples/Jobs/src/main/java' + java.srcDir '../../samples/PubSubStress/src/main/java' + java.srcDir '../../samples/Shadow/src/main/java' + java.srcDir 'src/main/java' + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + +} + +repositories { + mavenCentral() + maven { + url System.getenv('HOME') + "/.m2/repository" + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'software.amazon.awssdk.crt:android:0.5.4' + implementation 'com.google.code.gson:gson:2.8.5' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core:1.2.0' + implementation 'androidx.core:core-ktx:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/android/app/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 diff --git a/android/app/src/androidTest/java/software/amazon/awssdk/iotsamples/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/software/amazon/awssdk/iotsamples/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..442bbd9c6 --- /dev/null +++ b/android/app/src/androidTest/java/software/amazon/awssdk/iotsamples/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package software.amazon.awssdk.iotsamples + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("software.amazon.awssdk.iotsamples", appContext.packageName) + } +} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..fa5ae0e9f --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/assets/.gitignore b/android/app/src/main/assets/.gitignore new file mode 100644 index 000000000..0ff1a5d35 --- /dev/null +++ b/android/app/src/main/assets/.gitignore @@ -0,0 +1,2 @@ +*.txt +*.pem diff --git a/android/app/src/main/assets/README.md b/android/app/src/main/assets/README.md new file mode 100644 index 000000000..ec0c4a818 --- /dev/null +++ b/android/app/src/main/assets/README.md @@ -0,0 +1,13 @@ +Files required to run samples: +ca-certificates.crt - Taken from any recent Linux /etc/ssl +certificate.pem - IoT Thing Certificate +privatekey.pem - IoT Thing Private Key +endpoint.txt - IoT ATS Endpoint +AmazonRootCA1.pem - Available from https://www.amazontrust.com/repository/AmazonRootCA1.pem + +Optional: +clientId.txt - specifies --clientId CLI argument +topic.txt - specifies --topic CLI argument +message.txt - specifies --message CLI argument +port.txt - specifies --port CLI argument +thingName.txt - specifies --thingName CLI argument diff --git a/android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.kt b/android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.kt new file mode 100644 index 000000000..f579f0833 --- /dev/null +++ b/android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.kt @@ -0,0 +1,172 @@ +package software.amazon.awssdk.iotsamples + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.view.View +import android.widget.AdapterView +import android.widget.ArrayAdapter +import android.widget.Spinner +import android.widget.TextView +import java.io.FileNotFoundException +import java.io.FileOutputStream +import java.io.OutputStream +import java.io.PrintStream +import java.lang.Exception +import kotlin.concurrent.thread + +val SAMPLES = mapOf( + "Publish/Subscribe Sample" to "pubsub.PubSub", + "Jobs Client Sample" to "jobs.JobsSample", + "Shadow Client Sample" to "shadow.ShadowSample", + "Publish/Subscribe Load Test" to "pubsubstress.PubSubStress" +) + +class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener { + + private class StreamTee(val source: OutputStream, val log: (message: String) -> Unit) + : PrintStream(source, true) { + init { + if (source == System.out) { + System.setOut(this) + } else if (source == System.err) { + System.setErr(this) + } + } + + override fun write(buf: ByteArray, off: Int, len: Int) { + source.write(buf, off, len) + log(String(buf.slice(IntRange(off, off+len-1)).toByteArray())) + } + + override fun write(b: ByteArray) { + source.write(b) + log(String(b)) + } + } + + private val stdout : StreamTee; + private val stderr : StreamTee; + + private var console: TextView? = null; + private var sampleSelect: Spinner? = null; + + init { + stdout = StreamTee(System.out) { writeToConsole(it) } + stderr = StreamTee(System.err) { writeToConsole(it) } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + console = findViewById(R.id.console) + console?.isEnabled = false + + sampleSelect = findViewById(R.id.sampleSelect); + + val samples = SAMPLES.keys.toMutableList() + samples.add(0, "Please select a sample") + val samplesAdapter = ArrayAdapter(this, R.layout.support_simple_spinner_dropdown_item, samples) + sampleSelect?.adapter = samplesAdapter + + sampleSelect?.onItemSelectedListener = this + } + + private fun clearConsole() { + runOnUiThread() { + console?.text = "" + } + } + + private fun writeToConsole(message: String) { + runOnUiThread() { + console?.append(message) + } + } + + private fun onSampleComplete() { + runOnUiThread() { + sampleSelect?.isEnabled = true + } + } + + private fun assetContents(assetName: String) : String { + resources.assets.open(assetName).use {res -> + val bytes = ByteArray(res.available()) + res.read(bytes) + return String(bytes).trim() + } + } + + private fun assetContentsOr(assetName: String, defaultValue: String) : String { + return try { + assetContents(assetName) + } catch (fnf: FileNotFoundException) { + defaultValue + } + } + + private fun runSample(name: String) { + val classLoader = Thread.currentThread().contextClassLoader + val sampleClass = classLoader.loadClass(name); + if (sampleClass == null) { + clearConsole() + writeToConsole("Could not find sample '${name}'") + } + + thread(name="sample_runner", contextClassLoader = classLoader) { + // find resources, copy them into the cache so samples can get paths to them + val resourceNames = listOf("AmazonRootCA1.pem", "certificate.pem", "privatekey.pem") + val resourceMap = HashMap() + for (resourceName in resourceNames) { + resources.assets.open(resourceName).use { res -> + val cachedName = "${externalCacheDir}/${resourceName}" + FileOutputStream(cachedName).use { cachedRes -> + res.copyTo(cachedRes) + } + + resourceMap[resourceName] = cachedName + } + } + + val args = mutableListOf( + "--endpoint", assetContents("endpoint.txt"), + "--rootca", resourceMap["AmazonRootCA1.pem"], + "--cert", resourceMap["certificate.pem"], + "--key", resourceMap["privatekey.pem"], + "--port", assetContentsOr("port.txt", "8883"), + "--clientId", assetContentsOr("clientId.txt", "android-java-crt-test") + ) + if (name == "pubsub.PubSub") { + args.addAll(arrayOf( + "--topic", assetContentsOr("topic.txt", "/samples/test"), + "--message", assetContentsOr("message.txt", "Hello World From Android"))) + } else if (name in arrayOf("jobs.JobsSample", "shadow.ShadowSample")) { + args.addAll(arrayOf( + "--thingName", assetContentsOr("thingName.txt", "aws-iot-unit-test") + )) + } + val main = sampleClass.getMethod("main", Array::class.java) + try { + main.invoke(null, args.toTypedArray()) + } catch (e: Exception) { + writeToConsole(e.toString()) + } + onSampleComplete(); + } + } + + override fun onNothingSelected(p0: AdapterView<*>?) { + clearConsole() + writeToConsole("Please select a sample above") + } + + override fun onItemSelected(parent: AdapterView<*>?, view: View?, pos: Int, id: Long) { + clearConsole() + val sampleName = parent?.getItemAtPosition(pos).toString() + val sampleClassName = SAMPLES[sampleName] + if (sampleClassName != null) { + return runSample(sampleClassName) + } + } +} diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..07d5da9cb --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..fe07125e2 --- /dev/null +++ b/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a571e6009 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..61da551c5 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c41dd2853 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..db5080a75 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..6dba46dab Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..da31a871c Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..15ac68172 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..b216f2d31 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f25a41974 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e96783ccc Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..030098fe0 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #6200EE + #3700B3 + #03DAC5 + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..460f62280 --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + IoTSamples + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 000000000..5885930df --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/android/app/src/test/java/software/amazon/awssdk/iotsamples/ExampleUnitTest.kt b/android/app/src/test/java/software/amazon/awssdk/iotsamples/ExampleUnitTest.kt new file mode 100644 index 000000000..7134c54cd --- /dev/null +++ b/android/app/src/test/java/software/amazon/awssdk/iotsamples/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package software.amazon.awssdk.iotsamples + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 000000000..dbf85578e --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.72' + repositories { + google() + jcenter() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.6.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 000000000..23339e0df --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..f6b961fd5 Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..f3ecd51a6 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Apr 20 15:34:36 PDT 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 000000000..cccdd3d51 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 000000000..e95643d6a --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 000000000..c05010163 --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name='IoTSamples' +include ':app' diff --git a/samples/Shadow/src/main/java/shadow/ShadowSample.java b/samples/Shadow/src/main/java/shadow/ShadowSample.java index 6831ce10a..eef94032d 100644 --- a/samples/Shadow/src/main/java/shadow/ShadowSample.java +++ b/samples/Shadow/src/main/java/shadow/ShadowSample.java @@ -68,7 +68,8 @@ static void printUsage() { " -e|--endpoint AWS IoT service endpoint hostname\n"+ " -r|--rootca Path to the root certificate\n"+ " -c|--cert Path to the IoT thing certificate\n"+ - " -k|--key Path to the IoT thing private key" + " -k|--key Path to the IoT thing private key\n"+ + " -p|--port Port to use (optional)" ); } @@ -108,6 +109,12 @@ static void parseCommandLine(String[] args) { keyPath = args[++idx]; } break; + case "-p": + case "--port": + if (idx +1 < args.length) { + port = Integer.parseInt(args[++idx]); + } + break; default: System.out.println("Unrecognized argument: " + args[idx]); } diff --git a/sdk/pom.xml b/sdk/pom.xml index 536bef393..b82eed715 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -41,7 +41,7 @@ software.amazon.awssdk.crt aws-crt - 0.5.2 + 0.5.4 compile diff --git a/sdk/src/main/java/software/amazon/awssdk/iot/AwsSigv4HandshakeTransformer.java b/sdk/src/main/java/software/amazon/awssdk/iot/AwsSigv4HandshakeTransformer.java index b379dead7..820bb11e3 100644 --- a/sdk/src/main/java/software/amazon/awssdk/iot/AwsSigv4HandshakeTransformer.java +++ b/sdk/src/main/java/software/amazon/awssdk/iot/AwsSigv4HandshakeTransformer.java @@ -23,7 +23,6 @@ import software.amazon.awssdk.crt.http.HttpRequest; import software.amazon.awssdk.crt.mqtt.WebsocketHandshakeTransformArgs; -import java.time.Instant; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; @@ -52,7 +51,7 @@ protected void releaseNativeHandle() {} public void accept(WebsocketHandshakeTransformArgs handshakeArgs) { try (AwsSigningConfig config = signingConfig.clone()) { - config.setTime(Instant.now()); + config.setTime(System.currentTimeMillis()); CompletableFuture signingFuture = AwsSigner.signRequest(handshakeArgs.getHttpRequest(), config); signingFuture.whenComplete((HttpRequest request, Throwable error) -> {