diff --git a/aws-android-sdk-apigateway-core/build.gradle b/aws-android-sdk-apigateway-core/build.gradle index 673d68b1b9..c82526e0e3 100644 --- a/aws-android-sdk-apigateway-core/build.gradle +++ b/aws-android-sdk-apigateway-core/build.gradle @@ -1,9 +1,24 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 27 + versionCode 1 + versionName '1.0' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-apigateway-core/pom.xml b/aws-android-sdk-apigateway-core/pom.xml index af07be0652..23401336b3 100644 --- a/aws-android-sdk-apigateway-core/pom.xml +++ b/aws-android-sdk-apigateway-core/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-apigateway-core - jar + aar AWS SDK for Android - Amazon API Gateway Client Runtime The AWS Android SDK for Amazon API Gateway Runtime module holds the runtime library needed by the generated client for APIs defined in Amazon API Gateway. http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-apigateway-core/src/main/AndroidManifest.xml b/aws-android-sdk-apigateway-core/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..8e439a05d1 --- /dev/null +++ b/aws-android-sdk-apigateway-core/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-apigateway-test/build.gradle b/aws-android-sdk-apigateway-test/build.gradle index 08d0413cec..3847c6e7a1 100644 --- a/aws-android-sdk-apigateway-test/build.gradle +++ b/aws-android-sdk-apigateway-test/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 21 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-auth-core/build.gradle b/aws-android-sdk-auth-core/build.gradle index 518b818a1e..b596f07d6d 100644 --- a/aws-android-sdk-auth-core/build.gradle +++ b/aws-android-sdk-auth-core/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 11 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-auth-core/pom.xml b/aws-android-sdk-auth-core/pom.xml index 80723cc0b5..0ce6ba0137 100644 --- a/aws-android-sdk-auth-core/pom.xml +++ b/aws-android-sdk-auth-core/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,7 +7,6 @@ AWS SDK for Android - AWS Authentication Core The AWS Android SDK for AWS Authentication Core module holds the client classes that are used for enabling communication with Amazon CognitoIdentityProvider, Amazon Cognito UserPools, Facebook and Google SignIn Providers http://aws.amazon.com/sdkforandroid - UTF-8 @@ -15,13 +15,11 @@ UTF-8 - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -29,7 +27,6 @@ false 2.16.13 - com.google.android android @@ -37,7 +34,6 @@ provided - @@ -52,16 +48,14 @@ - org.apache.maven.plugins maven-compiler-plugin - org.apache.maven.plugins maven-javadoc-plugin - \ No newline at end of file + diff --git a/aws-android-sdk-auth-facebook/build.gradle b/aws-android-sdk-auth-facebook/build.gradle index b47cd6ff6e..8e3073c27f 100644 --- a/aws-android-sdk-auth-facebook/build.gradle +++ b/aws-android-sdk-auth-facebook/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 11 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-auth-facebook/pom.xml b/aws-android-sdk-auth-facebook/pom.xml index afb9197f16..026e25a6a7 100644 --- a/aws-android-sdk-auth-facebook/pom.xml +++ b/aws-android-sdk-auth-facebook/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,7 +7,6 @@ AWS SDK for Android - AWS Facebook SignIn The AWS Android SDK for AWS Facebook SignIn that holds the client classes used for enabling communication with Facebook SignIn http://aws.amazon.com/sdkforandroid - UTF-8 @@ -15,20 +15,17 @@ UTF-8 - com.amazonaws aws-android-sdk-pom 2.16.13 - google-maven https://maven.google.com - com.amazonaws @@ -43,7 +40,6 @@ 4.1.1.4 provided - com.facebook.android @@ -58,7 +54,6 @@ - com.android.support @@ -68,7 +63,6 @@ true - @@ -83,7 +77,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -94,4 +87,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-auth-google/build.gradle b/aws-android-sdk-auth-google/build.gradle index c876aacdb0..6c7305b230 100644 --- a/aws-android-sdk-auth-google/build.gradle +++ b/aws-android-sdk-auth-google/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 11 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-auth-google/pom.xml b/aws-android-sdk-auth-google/pom.xml index 4996995f2b..40fea2b022 100644 --- a/aws-android-sdk-auth-google/pom.xml +++ b/aws-android-sdk-auth-google/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,7 +7,6 @@ AWS SDK for Android - AWS Google SignIn The AWS Android SDK for AWS Google SignIn that holds the client classes that are used for enabling communication with Google SignIn http://aws.amazon.com/sdkforandroid - UTF-8 @@ -15,20 +15,17 @@ UTF-8 - com.amazonaws aws-android-sdk-pom 2.16.13 - google-maven https://maven.google.com - com.amazonaws @@ -37,14 +34,12 @@ 2.16.13 aar - com.google.android android 4.1.1.4 provided - com.android.support support-v4 @@ -52,7 +47,6 @@ true aar - com.google.android.gms play-services-auth @@ -61,7 +55,6 @@ aar - @@ -76,7 +69,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -87,4 +79,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-auth-ui/build.gradle b/aws-android-sdk-auth-ui/build.gradle index 3728b03f6b..827b4e91c6 100644 --- a/aws-android-sdk-auth-ui/build.gradle +++ b/aws-android-sdk-auth-ui/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 23 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-auth-ui/pom.xml b/aws-android-sdk-auth-ui/pom.xml index 2d8e0277ec..f9e76e8a43 100644 --- a/aws-android-sdk-auth-ui/pom.xml +++ b/aws-android-sdk-auth-ui/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,7 +7,6 @@ AWS SDK for Android - AWS Authentication UI The AWS Android SDK for Authentication UI holds the client classes that are used for presenting the SignIn Screen with SignInButtons and Amazon Cognito UserPools UI http://aws.amazon.com/sdkforandroid - UTF-8 @@ -15,20 +15,17 @@ UTF-8 - com.amazonaws aws-android-sdk-pom 2.16.13 - google-maven https://maven.google.com - com.amazonaws @@ -72,7 +69,6 @@ aar - @@ -87,7 +83,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -98,4 +93,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-auth-userpools/pom.xml b/aws-android-sdk-auth-userpools/pom.xml index b387d8614b..1f4e007c5e 100644 --- a/aws-android-sdk-auth-userpools/pom.xml +++ b/aws-android-sdk-auth-userpools/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,7 +7,6 @@ AWS SDK for Android - AWS Cognito Userpools SignIn The AWS Android SDK for Authentication - Cognito Userpools SignIn holds the client classes that are used for enabling communication with Cognito UserPools SignIn Provider http://aws.amazon.com/sdkforandroid - UTF-8 @@ -15,20 +15,17 @@ UTF-8 - com.amazonaws aws-android-sdk-pom 2.16.13 - google-maven https://maven.google.com - com.amazonaws @@ -36,7 +33,6 @@ false 2.16.13 - com.amazonaws aws-android-sdk-auth-core @@ -44,14 +40,12 @@ 2.16.13 aar - com.google.android android 4.1.1.4 provided - com.android.support support-v4 @@ -60,7 +54,6 @@ aar - @@ -75,7 +68,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -86,4 +78,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-autoscaling/build.gradle b/aws-android-sdk-autoscaling/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-autoscaling/build.gradle +++ b/aws-android-sdk-autoscaling/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-autoscaling/pom.xml b/aws-android-sdk-autoscaling/pom.xml index 03e3679fbd..2287cf61cb 100644 --- a/aws-android-sdk-autoscaling/pom.xml +++ b/aws-android-sdk-autoscaling/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-autoscaling - jar + aar AWS SDK for Android - Auto Scaling The AWS Android SDK for Auto Scaling module holds the client classes that are used for communicating with Auto Scaling Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-autoscaling/src/main/AndroidManifest.xml b/aws-android-sdk-autoscaling/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..16e4820ed1 --- /dev/null +++ b/aws-android-sdk-autoscaling/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-cloudwatch/build.gradle b/aws-android-sdk-cloudwatch/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-cloudwatch/build.gradle +++ b/aws-android-sdk-cloudwatch/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-cloudwatch/pom.xml b/aws-android-sdk-cloudwatch/pom.xml index 686fb2623d..278a4a54e1 100644 --- a/aws-android-sdk-cloudwatch/pom.xml +++ b/aws-android-sdk-cloudwatch/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-cloudwatch - jar + aar AWS SDK for Android - Amazon CloudWatch The AWS Android SDK for Amazon CloudWatch module holds the client classes that are used for communicating with Amazon CloudWatch Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-cloudwatch/src/main/AndroidManifest.xml b/aws-android-sdk-cloudwatch/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..26a72b8617 --- /dev/null +++ b/aws-android-sdk-cloudwatch/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-cognito/build.gradle b/aws-android-sdk-cognito/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-cognito/build.gradle +++ b/aws-android-sdk-cognito/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-cognito/pom.xml b/aws-android-sdk-cognito/pom.xml index 42785172f1..3133846ee1 100644 --- a/aws-android-sdk-cognito/pom.xml +++ b/aws-android-sdk-cognito/pom.xml @@ -1,19 +1,18 @@ + 4.0.0 com.amazonaws aws-android-sdk-cognito - jar + aar AWS SDK for Android - Amazon Cognito Sync 2.16.13 The AWS Android SDK for Amazon Cognito Sync module holds the client classes that are used for communicating with Amazon Cognito Sync Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - Amazon Software License @@ -21,7 +20,6 @@ repo - com.amazonaws @@ -36,9 +34,20 @@ provided - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -49,4 +58,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-cognito/src/main/AndroidManifest.xml b/aws-android-sdk-cognito/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..9ebc7ab976 --- /dev/null +++ b/aws-android-sdk-cognito/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/aws-android-sdk-cognitoauth/pom.xml b/aws-android-sdk-cognitoauth/pom.xml index 104ba1babf..73ca38d1a7 100644 --- a/aws-android-sdk-cognitoauth/pom.xml +++ b/aws-android-sdk-cognitoauth/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -7,20 +8,17 @@ 2.16.13 The AWS Android SDK with app integration for Amazon Cognito Your User Pools Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - google-maven https://maven.google.com - Apache License, Version 2.0 @@ -33,14 +31,13 @@ repo - com.google.android android 4.1.1.4 provided - + com.amazonaws aws-android-sdk-cognitoidentityprovider-asf @@ -60,20 +57,19 @@ aar - - com.simpligility.maven.plugins - android-maven-plugin - 4.5.0 - true - - - ${env.ANDROID_PLATFORM} - ${env.ANDROID_BUILDTOOL_VERSION} - - + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + org.apache.maven.plugins @@ -85,4 +81,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-cognitoidentityprovider-test/build.gradle b/aws-android-sdk-cognitoidentityprovider-test/build.gradle index 2d29652807..fbcc359fa5 100644 --- a/aws-android-sdk-cognitoidentityprovider-test/build.gradle +++ b/aws-android-sdk-cognitoidentityprovider-test/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 10 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' @@ -28,7 +28,9 @@ dependencies { androidTestImplementation 'org.mockito:mockito-core:2.19.0' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.0' + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.1' + androidTestImplementation 'com.google.dexmaker:dexmaker:1.1' + androidTestImplementation 'org.mockito:mockito-core:1.9.5' androidTestImplementation project(':aws-android-sdk-testutils') } diff --git a/aws-android-sdk-cognitoidentityprovider-test/src/androidTest/AndroidManifest.xml b/aws-android-sdk-cognitoidentityprovider-test/src/androidTest/AndroidManifest.xml index d49f5c150b..d6119f88a6 100644 --- a/aws-android-sdk-cognitoidentityprovider-test/src/androidTest/AndroidManifest.xml +++ b/aws-android-sdk-cognitoidentityprovider-test/src/androidTest/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.amazonaws.mobileconnectors.cognitoidentityprovider.test" > diff --git a/aws-android-sdk-cognitoidentityprovider/build.gradle b/aws-android-sdk-cognitoidentityprovider/build.gradle index c4dffc01ab..d67bf7005a 100644 --- a/aws-android-sdk-cognitoidentityprovider/build.gradle +++ b/aws-android-sdk-cognitoidentityprovider/build.gradle @@ -1,14 +1,26 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider-asf:1.0.0' - - testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-all:1.10.5' - testImplementation 'org.robolectric:robolectric:3.8' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-cognitoidentityprovider/pom.xml b/aws-android-sdk-cognitoidentityprovider/pom.xml index d8bc552edd..3049b246fe 100644 --- a/aws-android-sdk-cognitoidentityprovider/pom.xml +++ b/aws-android-sdk-cognitoidentityprovider/pom.xml @@ -1,19 +1,18 @@ + 4.0.0 com.amazonaws aws-android-sdk-cognitoidentityprovider - jar + aar AWS SDK for Android - Amazon Cognito Identity Provider 2.16.13 The AWS Android SDK for Amazon Cognito Identity Provider module holds the client classes that are used for communicating with Amazon Cognito Identity Provider Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - Amazon Software License @@ -21,7 +20,6 @@ repo - com.amazonaws @@ -35,34 +33,21 @@ false 1.0.0 - - com.google.android - android - 2.3.3 - provided - - - junit - junit - 4.12 - test - - - org.robolectric - robolectric - 3.8 - test - - - org.mockito - mockito-all - 1.10.5 - test - - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -73,4 +58,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/AndroidManifest.xml b/aws-android-sdk-cognitoidentityprovider/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..15fe87935b --- /dev/null +++ b/aws-android-sdk-cognitoidentityprovider/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-comprehend/build.gradle b/aws-android-sdk-comprehend/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-comprehend/build.gradle +++ b/aws-android-sdk-comprehend/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-comprehend/pom.xml b/aws-android-sdk-comprehend/pom.xml index da07bfa3de..a0879b0dce 100644 --- a/aws-android-sdk-comprehend/pom.xml +++ b/aws-android-sdk-comprehend/pom.xml @@ -1,34 +1,47 @@ + - 4.0.0 + 4.0.0 + com.amazonaws + aws-android-sdk-comprehend + aar + AWS SDK for Android - Amazon Comprehend + The AWS Android SDK for Amazon Comprehend module holds the client classes that are used for communicating with Amazon Comprehend Service + http://aws.amazon.com/sdkforandroid + com.amazonaws - aws-android-sdk-comprehend - jar - AWS SDK for Android - Amazon Comprehend - The AWS Android SDK for Amazon Comprehend module holds the client classes that are used for communicating with Amazon Comprehend Service - http://aws.amazon.com/sdkforandroid - - com.amazonaws - aws-android-sdk-pom - 2.16.13 - - - - com.amazonaws - aws-android-sdk-core - false - 2.16.13 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - \ No newline at end of file + aws-android-sdk-pom + 2.16.13 + + + + com.amazonaws + aws-android-sdk-core + false + 2.16.13 + + + + + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + diff --git a/aws-android-sdk-comprehend/src/main/AndroidManifest.xml b/aws-android-sdk-comprehend/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..122a33625c --- /dev/null +++ b/aws-android-sdk-comprehend/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-connect/build.gradle b/aws-android-sdk-connect/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-connect/build.gradle +++ b/aws-android-sdk-connect/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-connect/pom.xml b/aws-android-sdk-connect/pom.xml index c3bc8e7763..79f8cab0e6 100644 --- a/aws-android-sdk-connect/pom.xml +++ b/aws-android-sdk-connect/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-connect - jar + aar AWS SDK for Android - Amazon Connect The AWS Android SDK for Amazon Connect module holds the client classes that are used for communicating with Amazon Connect Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-connectparticipant/build.gradle b/aws-android-sdk-connectparticipant/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-connectparticipant/build.gradle +++ b/aws-android-sdk-connectparticipant/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-connectparticipant/pom.xml b/aws-android-sdk-connectparticipant/pom.xml index 7e9d80955b..5f008b0b98 100644 --- a/aws-android-sdk-connectparticipant/pom.xml +++ b/aws-android-sdk-connectparticipant/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-connectparticipant - jar + aar AWS SDK for Android - Amazon Connect Participant The AWS Android SDK for Amazon Connect Participant module holds the client classes that are used for communicating with Amazon Connect Participant Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-connectparticipant/src/main/AndroidManifest.xml b/aws-android-sdk-connectparticipant/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..d74dda5dd0 --- /dev/null +++ b/aws-android-sdk-connectparticipant/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-core-test/build.gradle b/aws-android-sdk-core-test/build.gradle index 1f8e525f57..e42648ef41 100644 --- a/aws-android-sdk-core-test/build.gradle +++ b/aws-android-sdk-core-test/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 10 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-core/build.gradle b/aws-android-sdk-core/build.gradle index 001e39cddb..8ca2f51df4 100644 --- a/aws-android-sdk-core/build.gradle +++ b/aws-android-sdk-core/build.gradle @@ -1,40 +1,39 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + useLibrary 'org.apache.http.legacy' + + defaultConfig { + minSdkVersion 15 + 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' + } + } + + lintOptions { + warning 'NewApi' // Guarding issues in KeyValueStore + } +} dependencies { api 'com.google.code.gson:gson:2.2.4' - api 'com.google.android:android:2.3.3' implementation 'com.fasterxml.jackson.core:jackson-core:2.1.1' - // The getApi23 task puts a jar file in ./libs, so we need this. - compileOnly fileTree(dir: 'libs', include: ['*.jar']) - testImplementation 'joda-time:joda-time:2.0' testImplementation 'junit:junit:4.12' testImplementation 'org.apache.commons:commons-io:1.3.2' testImplementation 'org.easymock:easymock:3.1' + testImplementation 'org.robolectric:robolectric:3.8' + testImplementation 'xerces:xercesImpl:2.12.0' + testRuntimeOnly 'org.apache.httpcomponents:httpclient:4.5.12' } -// This task is to create a symbolic link to android-23.jar -// which is used only for compilation. Once the symbolic link -// is created, AWSCore has a compile only dependency on the -// jar linked by this symbolic link. - -// The minSdkVersion of AWSCore is still API Level 10. AWSCore -// uses API introduced in API Level 23 which will be executed -// only on device running an API Level of 23 and above. - -// gradle task can only have one commandLine. -// The following command (is idempotent) -// removes the libs folder, creates libs folder and -// creates a symbolic link to android-23.jar. -task getApi23(type:Exec) { - print 'Creating a symlink for Android API Level 23.' - workingDir '.' - commandLine 'sh', '-c', "rm -rf libs && mkdir libs && ln -s $System.env.ANDROID_HOME/platforms/android-23/android.jar libs/android-23.jar" -} - -compileJava.dependsOn(getApi23) - -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-core/pom.xml b/aws-android-sdk-core/pom.xml index 520670b445..864c1ea51c 100644 --- a/aws-android-sdk-core/pom.xml +++ b/aws-android-sdk-core/pom.xml @@ -1,41 +1,33 @@ + 4.0.0 com.amazonaws aws-android-sdk-core - jar + aar AWS SDK for Android - Core Runtime The AWS SDK for Android - Core module holds the classes that is used by the individual service clients to interact with Amazon Web Services. Users need to depend on aws-java-sdk artifact for accessing individual client classes. http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - - commons-logging - commons-logging - 1.1.1 - provided + com.google.code.gson + gson + 2.2.4 com.fasterxml.jackson.core jackson-core 2.1.1 - provided - com.google.code.gson - gson - 2.2.4 - - - com.google.android - android - 2.3.3 - provided + joda-time + joda-time + 2.0 + test junit @@ -44,15 +36,15 @@ test - joda-time - joda-time - 2.3 + org.apache.commons + commons-io + 1.3.2 test - commons-io - commons-io - 2.4 + org.apache.httpcomponents + httpclient + 4.5.12 test @@ -62,16 +54,32 @@ test - android - android - 6.0 - system - ${env.ANDROID_HOME}/platforms/android-23/android.jar - + org.robolectric + robolectric + 3.8 + test + + + xerces + xercesImpl + 2.12.0 + test + - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -82,4 +90,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-core/src/main/AndroidManifest.xml b/aws-android-sdk-core/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..38024359d9 --- /dev/null +++ b/aws-android-sdk-core/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/http/StaxResponseHandlerTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/http/StaxResponseHandlerTest.java index 23124e8e78..d9ea4b6296 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/http/StaxResponseHandlerTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/http/StaxResponseHandlerTest.java @@ -23,9 +23,12 @@ import com.amazonaws.util.StringUtils; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import java.io.ByteArrayInputStream; +@RunWith(RobolectricTestRunner.class) public class StaxResponseHandlerTest { @Test diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/metrics/AwsSdkMetricsTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/metrics/AwsSdkMetricsTest.java index 43c704be03..d7dfa9b895 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/metrics/AwsSdkMetricsTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/metrics/AwsSdkMetricsTest.java @@ -25,11 +25,14 @@ import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import java.util.Arrays; import java.util.Collections; import java.util.Set; +@RunWith(RobolectricTestRunner.class) public class AwsSdkMetricsTest { /** * By default the AWS SDK metric collection is disabled. Enabling it should diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/mobile/config/AWSConfigurationTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/mobile/config/AWSConfigurationTest.java index 3da4188793..aeb10f776c 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/mobile/config/AWSConfigurationTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/mobile/config/AWSConfigurationTest.java @@ -21,11 +21,14 @@ import org.json.JSONException; import org.json.JSONObject; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +@RunWith(RobolectricTestRunner.class) public class AWSConfigurationTest { private static final String jsonString = "{\n" + diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/LegacyErrorUnmarshallerTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/LegacyErrorUnmarshallerTest.java index ab54d7dfdb..d969c9d681 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/LegacyErrorUnmarshallerTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/LegacyErrorUnmarshallerTest.java @@ -20,7 +20,7 @@ import com.amazonaws.AmazonServiceException; import com.amazonaws.AmazonServiceException.ErrorType; import com.amazonaws.transform.LegacyErrorUnmarshaller; -import com.sun.org.apache.xerces.internal.dom.DocumentImpl; +import org.apache.xerces.dom.DocumentImpl; import org.junit.Test; import org.w3c.dom.Document; diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallerTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallerTest.java index 28c00b766a..f8b9e6d25c 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallerTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/SimpleTypeStaxUnmarshallerTest.java @@ -24,6 +24,8 @@ import com.amazonaws.util.StringUtils; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; @@ -35,6 +37,7 @@ import java.nio.ByteBuffer; import java.util.Date; +@RunWith(RobolectricTestRunner.class) public class SimpleTypeStaxUnmarshallerTest { /** Shared factory for creating XML event readers */ diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StandardErrorUnmarshallerTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StandardErrorUnmarshallerTest.java index 8613afa35f..5afba0d896 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StandardErrorUnmarshallerTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StandardErrorUnmarshallerTest.java @@ -17,10 +17,10 @@ import static org.junit.Assert.assertEquals; -import com.amazonaws.AmazonServiceException; import com.amazonaws.AmazonServiceException.ErrorType; +import com.amazonaws.AmazonServiceException; import com.amazonaws.transform.StandardErrorUnmarshaller; -import com.sun.org.apache.xerces.internal.dom.DocumentImpl; +import org.apache.xerces.dom.DocumentImpl; import org.junit.Test; import org.w3c.dom.Document; diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StaxUnmarshallerContextTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StaxUnmarshallerContextTest.java index 6116b53aac..4747636698 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StaxUnmarshallerContextTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/StaxUnmarshallerContextTest.java @@ -22,6 +22,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; @@ -31,6 +33,7 @@ import java.util.HashMap; import java.util.Map; +@RunWith(RobolectricTestRunner.class) public class StaxUnmarshallerContextTest { private static final XmlPullParserFactory factory; static { diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/VoidStaxUnmarshallerTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/VoidStaxUnmarshallerTest.java index c978226bd9..c473ad4923 100644 --- a/aws-android-sdk-core/src/test/java/com/amazonaws/transform/VoidStaxUnmarshallerTest.java +++ b/aws-android-sdk-core/src/test/java/com/amazonaws/transform/VoidStaxUnmarshallerTest.java @@ -20,6 +20,8 @@ import com.amazonaws.AmazonClientException; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; @@ -27,6 +29,7 @@ import java.io.IOException; import java.io.StringReader; +@RunWith(RobolectricTestRunner.class) public class VoidStaxUnmarshallerTest { /** Shared factory for creating XML event readers */ diff --git a/aws-android-sdk-core/src/test/resources/robolectric.properties b/aws-android-sdk-core/src/test/resources/robolectric.properties new file mode 100644 index 0000000000..8cb873d4a0 --- /dev/null +++ b/aws-android-sdk-core/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=27 diff --git a/aws-android-sdk-ddb-document/build.gradle b/aws-android-sdk-ddb-document/build.gradle index 64a9cceb7e..1a832d1ff3 100644 --- a/aws-android-sdk-ddb-document/build.gradle +++ b/aws-android-sdk-ddb-document/build.gradle @@ -1,4 +1,23 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') @@ -6,6 +25,3 @@ dependencies { implementation project(':aws-android-sdk-ddb') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-ddb-document/pom.xml b/aws-android-sdk-ddb-document/pom.xml index d065125f2b..62e0192f32 100644 --- a/aws-android-sdk-ddb-document/pom.xml +++ b/aws-android-sdk-ddb-document/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-ddb-document - jar + aar AWS SDK for Android - Amazon DynamoDB Document (Beta) The AWS Android SDK for Amazon DynamoDB Document (Beta) provides full JSON data support, use of Document Path to access part of a document, and new data types such as Map, Primitive, List, and Boolean. http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -33,15 +32,26 @@ 20.0 - junit - junit - 4.12 - test + junit + junit + 4.12 + test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -50,6 +60,6 @@ org.apache.maven.plugins maven-javadoc-plugin - + - \ No newline at end of file + diff --git a/aws-android-sdk-ddb-document/src/main/AndroidManifest.xml b/aws-android-sdk-ddb-document/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..db7f92cb95 --- /dev/null +++ b/aws-android-sdk-ddb-document/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-ddb-mapper/build.gradle b/aws-android-sdk-ddb-mapper/build.gradle index 96d62ab8e1..b4556225ba 100644 --- a/aws-android-sdk-ddb-mapper/build.gradle +++ b/aws-android-sdk-ddb-mapper/build.gradle @@ -1,4 +1,24 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + useLibrary 'org.apache.http.legacy' + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-ddb') @@ -6,8 +26,6 @@ dependencies { testImplementation 'junit:junit:4.12' testImplementation 'org.easymock:easymock:3.1' + testRuntimeOnly 'org.apache.httpcomponents:httpclient:4.5.12' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-ddb-mapper/pom.xml b/aws-android-sdk-ddb-mapper/pom.xml index 9e6a2d952e..5c3771b639 100644 --- a/aws-android-sdk-ddb-mapper/pom.xml +++ b/aws-android-sdk-ddb-mapper/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-ddb-mapper - jar + aar AWS SDK for Android - Amazon DynamoDB Mapper The AWS Android SDK for Amazon DynamoDB Mapper module holds the client classes that are used for communicating with Amazon DynamoDB Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -32,22 +31,39 @@ false 2.16.13 - - junit - junit - 4.12 - test + + junit + junit + 4.12 + test + + + org.easymock + easymock + 3.1 + test + + + org.apache.httpcomponents + httpclient + 4.5.12 + test - - org.easymock - easymock - 3.1 - test - - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -56,6 +72,6 @@ org.apache.maven.plugins maven-javadoc-plugin - + - \ No newline at end of file + diff --git a/aws-android-sdk-ddb-mapper/src/main/AndroidManifest.xml b/aws-android-sdk-ddb-mapper/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..0f93515a50 --- /dev/null +++ b/aws-android-sdk-ddb-mapper/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/aws-android-sdk-ddb/build.gradle b/aws-android-sdk-ddb/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-ddb/build.gradle +++ b/aws-android-sdk-ddb/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-ddb/pom.xml b/aws-android-sdk-ddb/pom.xml index c0c13b5b61..659c43d968 100644 --- a/aws-android-sdk-ddb/pom.xml +++ b/aws-android-sdk-ddb/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-ddb - jar + aar AWS SDK for Android - Amazon DynamoDB The AWS Android SDK for Amazon DynamoDB module holds the client classes that are used for communicating with Amazon DynamoDB Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -20,16 +19,27 @@ false 2.16.13 - - junit - junit - 4.12 - test + + junit + junit + 4.12 + test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -40,4 +50,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-ddb/src/main/AndroidManifest.xml b/aws-android-sdk-ddb/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..af76a9c773 --- /dev/null +++ b/aws-android-sdk-ddb/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-ec2/build.gradle b/aws-android-sdk-ec2/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-ec2/build.gradle +++ b/aws-android-sdk-ec2/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-ec2/pom.xml b/aws-android-sdk-ec2/pom.xml index e69eaba0e2..7f379bd5e8 100644 --- a/aws-android-sdk-ec2/pom.xml +++ b/aws-android-sdk-ec2/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-ec2 - jar + aar AWS SDK for Android - Amazon EC2 The AWS Android SDK for Amazon EC2 module holds the client classes that are used for communicating with Amazon EC2 Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-ec2/src/main/AndroidManifest.xml b/aws-android-sdk-ec2/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..9e7e47eed6 --- /dev/null +++ b/aws-android-sdk-ec2/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-elb/build.gradle b/aws-android-sdk-elb/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-elb/build.gradle +++ b/aws-android-sdk-elb/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-elb/pom.xml b/aws-android-sdk-elb/pom.xml index d4922536dd..25152815b0 100644 --- a/aws-android-sdk-elb/pom.xml +++ b/aws-android-sdk-elb/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-elb - jar + aar AWS SDK for Android - Elastic Load Balancing The AWS Android SDK for Elastic Load Balancing module holds the client classes that are used for communicating with Elastic Load Balancing Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-elb/src/main/AndroidManifest.xml b/aws-android-sdk-elb/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..e1b44795d2 --- /dev/null +++ b/aws-android-sdk-elb/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-iot/build.gradle b/aws-android-sdk-iot/build.gradle index a7fe38c2d1..052ac0ea71 100644 --- a/aws-android-sdk-iot/build.gradle +++ b/aws-android-sdk-iot/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 11 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-iot/pom.xml b/aws-android-sdk-iot/pom.xml index 35ec8bab9e..9e73b72dd9 100644 --- a/aws-android-sdk-iot/pom.xml +++ b/aws-android-sdk-iot/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,13 +7,11 @@ AWS SDK for Android - AWS IoT The AWS Android SDK for AWS IoT module holds the client classes that are used for communicating with AWS IoT Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -51,7 +50,6 @@ aar - @@ -76,4 +74,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-iot/src/test/resources/robolectric.properties b/aws-android-sdk-iot/src/test/resources/robolectric.properties new file mode 100644 index 0000000000..8cb873d4a0 --- /dev/null +++ b/aws-android-sdk-iot/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=27 diff --git a/aws-android-sdk-kinesis/build.gradle b/aws-android-sdk-kinesis/build.gradle index a28cc566c0..eb02bcb7d4 100644 --- a/aws-android-sdk-kinesis/build.gradle +++ b/aws-android-sdk-kinesis/build.gradle @@ -1,4 +1,23 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') @@ -9,6 +28,3 @@ dependencies { testImplementation 'org.robolectric:robolectric:3.8' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-kinesis/pom.xml b/aws-android-sdk-kinesis/pom.xml index 180490d257..7b170f6d94 100644 --- a/aws-android-sdk-kinesis/pom.xml +++ b/aws-android-sdk-kinesis/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-kinesis - jar + aar AWS SDK for Android - Amazon Kinesis The AWS Android SDK for Amazon Kinesis module holds the client classes that are used for communicating with Amazon Kinesis Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -45,9 +44,20 @@ test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -58,4 +68,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-kinesis/src/main/AndroidManifest.xml b/aws-android-sdk-kinesis/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..4340c1acde --- /dev/null +++ b/aws-android-sdk-kinesis/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-kinesis/src/test/java/com/amazonaws/mobileconnectors/kinesis/kinesisrecorder/KinesisFirehoseRecorderTest.java b/aws-android-sdk-kinesis/src/test/java/com/amazonaws/mobileconnectors/kinesis/kinesisrecorder/KinesisFirehoseRecorderTest.java index 15238a2a4b..c78b8ecdec 100644 --- a/aws-android-sdk-kinesis/src/test/java/com/amazonaws/mobileconnectors/kinesis/kinesisrecorder/KinesisFirehoseRecorderTest.java +++ b/aws-android-sdk-kinesis/src/test/java/com/amazonaws/mobileconnectors/kinesis/kinesisrecorder/KinesisFirehoseRecorderTest.java @@ -25,9 +25,12 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import java.io.IOException; +@RunWith(RobolectricTestRunner.class) public class KinesisFirehoseRecorderTest { @Rule public TemporaryFolder temp = new TemporaryFolder(); diff --git a/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle b/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle index e940167343..fe6d13db20 100644 --- a/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle +++ b/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 21 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-kinesisvideo-archivedmedia/pom.xml b/aws-android-sdk-kinesisvideo-archivedmedia/pom.xml index 65367344e2..0dd0f2188c 100644 --- a/aws-android-sdk-kinesisvideo-archivedmedia/pom.xml +++ b/aws-android-sdk-kinesisvideo-archivedmedia/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-kinesisvideo-archivedmedia - jar + aar AWS SDK for Android - Amazon Kinesis Video Streams Archived Media The AWS Android SDK for Amazon Kinesis Video Streams Archived Media module holds the client classes that are used for communicating with Amazon Kinesis Video Streams Service Archived Media http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -27,9 +26,20 @@ test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -40,4 +50,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-kinesisvideo-signaling/build.gradle b/aws-android-sdk-kinesisvideo-signaling/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-kinesisvideo-signaling/build.gradle +++ b/aws-android-sdk-kinesisvideo-signaling/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-kinesisvideo-signaling/pom.xml b/aws-android-sdk-kinesisvideo-signaling/pom.xml index 572f76588a..f37d7ad995 100644 --- a/aws-android-sdk-kinesisvideo-signaling/pom.xml +++ b/aws-android-sdk-kinesisvideo-signaling/pom.xml @@ -1,37 +1,47 @@ + - 4.0.0 + 4.0.0 + com.amazonaws + aws-android-sdk-kinesisvideo-signaling + aar + AWS SDK for Android - Amazon Kinesis + The AWS Android SDK for Amazon Kinesis Video Signaling module holds the client classes that are used for communicating with Amazon Kinesis Video Signaling Service + http://aws.amazon.com/sdkforandroid + com.amazonaws - aws-android-sdk-kinesisvideo-signaling - jar - AWS SDK for Android - Amazon Kinesis - The AWS Android SDK for Amazon Kinesis Video Signaling module holds the client classes that are used for communicating with Amazon Kinesis Video Signaling Service - http://aws.amazon.com/sdkforandroid - - - com.amazonaws - aws-android-sdk-pom - 2.16.13 - - - - - com.amazonaws - aws-android-sdk-core - false - 2.16.13 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - \ No newline at end of file + aws-android-sdk-pom + 2.16.13 + + + + com.amazonaws + aws-android-sdk-core + false + 2.16.13 + + + + + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + diff --git a/aws-android-sdk-kinesisvideo-signaling/src/main/AndroidManifest.xml b/aws-android-sdk-kinesisvideo-signaling/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..215efd15ca --- /dev/null +++ b/aws-android-sdk-kinesisvideo-signaling/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/aws-android-sdk-kinesisvideo/build.gradle b/aws-android-sdk-kinesisvideo/build.gradle index 965db0aac0..94c05ab1ac 100644 --- a/aws-android-sdk-kinesisvideo/build.gradle +++ b/aws-android-sdk-kinesisvideo/build.gradle @@ -2,9 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion 27 + useLibrary 'org.apache.http.legacy' defaultConfig { - minSdkVersion 21 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' @@ -17,13 +18,13 @@ android { } } - lintOptions { - abortOnError false - } - packagingOptions { exclude 'META-INF/DEPENDENCIES' } + + lintOptions { + abortOnError false + } } dependencies { @@ -32,6 +33,6 @@ dependencies { } implementation 'com.android.support:support-annotations:24.2.0' //noinspection DuplicatePlatformClasses - implementation 'org.apache.httpcomponents:httpclient:4.5.3' + compileOnly 'org.apache.httpcomponents:httpclient:4.5.3' } diff --git a/aws-android-sdk-kinesisvideo/pom.xml b/aws-android-sdk-kinesisvideo/pom.xml index 062dd640f5..58cf6548a9 100644 --- a/aws-android-sdk-kinesisvideo/pom.xml +++ b/aws-android-sdk-kinesisvideo/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,13 +7,11 @@ AWS SDK for Android - Amazon Kinesis Video Streams The AWS Android SDK for Amazon Kinesis Video Streams module holds the client classes that are used for communicating with Amazon Kinesis Video Streams Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - Amazon Software License @@ -20,22 +19,20 @@ repo - - - - android-support - file://${env.ANDROID_HOME}/extras/android/m2repository/ - - - google-android-gms - file://${env.ANDROID_HOME}/extras/google/m2repository/ - - - google-maven - https://maven.google.com - - - + + + android-support + file://${env.ANDROID_HOME}/extras/android/m2repository/ + + + google-android-gms + file://${env.ANDROID_HOME}/extras/google/m2repository/ + + + google-maven + https://maven.google.com + + com.amazonaws @@ -43,52 +40,41 @@ false 2.16.13 - - com.android.support - support-annotations - 24.2.0 + com.android.support + support-annotations + 24.2.0 - - - android - android - 5.0 - system - ${env.ANDROID_HOME}/platforms/android-${env.ANDROID_PLATFORM}/android.jar - - org.apache.httpcomponents httpclient 4.5.3 - - - com.simpligility.maven.plugins - android-maven-plugin - 4.5.0 - true - - - ${env.ANDROID_PLATFORM} - ${env.ANDROID_BUILDTOOL_VERSION} - - ${project.basedir}/src/main/jniLibs - - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + ${project.basedir}/src/main/jniLibs + + org.apache.maven.plugins maven-compiler-plugin - - 1.7 - 1.7 - UTF-8 - true - + + 1.7 + 1.7 + UTF-8 + true + org.apache.maven.plugins @@ -96,4 +82,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-kinesisvideo/src/main/AndroidManifest.xml b/aws-android-sdk-kinesisvideo/src/main/AndroidManifest.xml index 138e352929..6516a13e8a 100644 --- a/aws-android-sdk-kinesisvideo/src/main/AndroidManifest.xml +++ b/aws-android-sdk-kinesisvideo/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + diff --git a/aws-android-sdk-kms/build.gradle b/aws-android-sdk-kms/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-kms/build.gradle +++ b/aws-android-sdk-kms/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-kms/pom.xml b/aws-android-sdk-kms/pom.xml index 32ae062898..20656ad825 100644 --- a/aws-android-sdk-kms/pom.xml +++ b/aws-android-sdk-kms/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-kms - jar + aar AWS SDK for Android - AWS KMS The AWS Android SDK for AWS KMS module holds the client classes that are used for communicating with AWS Key Management Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-kms/src/main/AndroidManifest.xml b/aws-android-sdk-kms/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..0c11cf3867 --- /dev/null +++ b/aws-android-sdk-kms/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-lambda/build.gradle b/aws-android-sdk-lambda/build.gradle index 21eaedecd2..06b0d2f008 100644 --- a/aws-android-sdk-lambda/build.gradle +++ b/aws-android-sdk-lambda/build.gradle @@ -1,4 +1,23 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') @@ -8,6 +27,3 @@ dependencies { testImplementation 'org.robolectric:robolectric:3.8' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-lambda/pom.xml b/aws-android-sdk-lambda/pom.xml index f9417dffe9..4631a389c9 100644 --- a/aws-android-sdk-lambda/pom.xml +++ b/aws-android-sdk-lambda/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-lambda - jar + aar AWS SDK for Android - AWS Lambda The AWS Android SDK for AWS Lambda module holds the client classes that are used for communicating with AWS Lambda Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -39,9 +38,20 @@ test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -50,6 +60,6 @@ org.apache.maven.plugins maven-javadoc-plugin - + - \ No newline at end of file + diff --git a/aws-android-sdk-lambda/src/main/AndroidManifest.xml b/aws-android-sdk-lambda/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..a4c24c0caa --- /dev/null +++ b/aws-android-sdk-lambda/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-lambda/src/test/java/com/amazonaws/mobileconnectors/lambdainvoker/LambdaInvocationHandlerTest.java b/aws-android-sdk-lambda/src/test/java/com/amazonaws/mobileconnectors/lambdainvoker/LambdaInvocationHandlerTest.java index 799f4ba4b2..ddad1e9533 100644 --- a/aws-android-sdk-lambda/src/test/java/com/amazonaws/mobileconnectors/lambdainvoker/LambdaInvocationHandlerTest.java +++ b/aws-android-sdk-lambda/src/test/java/com/amazonaws/mobileconnectors/lambdainvoker/LambdaInvocationHandlerTest.java @@ -33,15 +33,17 @@ import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mockito; +import org.robolectric.RobolectricTestRunner; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.nio.ByteBuffer; +@RunWith(RobolectricTestRunner.class) public class LambdaInvocationHandlerTest { - private LambdaInvocationHandler handler; private AWSLambda lambda; private LambdaInvokerFactory factory; diff --git a/aws-android-sdk-lambda/src/test/resources/robolectric.properties b/aws-android-sdk-lambda/src/test/resources/robolectric.properties new file mode 100644 index 0000000000..8cb873d4a0 --- /dev/null +++ b/aws-android-sdk-lambda/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=27 diff --git a/aws-android-sdk-lex/build.gradle b/aws-android-sdk-lex/build.gradle index 9818eba968..9e2c7d3c77 100644 --- a/aws-android-sdk-lex/build.gradle +++ b/aws-android-sdk-lex/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 11 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-lex/pom.xml b/aws-android-sdk-lex/pom.xml index d4a4bac4ff..bb9b167918 100644 --- a/aws-android-sdk-lex/pom.xml +++ b/aws-android-sdk-lex/pom.xml @@ -1,86 +1,84 @@ + - 4.0.0 + 4.0.0 + com.amazonaws + aws-android-sdk-lex + aar + AWS SDK for Android - Amazon Lex + The AWS Android SDK for Amazon Lex + http://aws.amazon.com/mobile/sdk + com.amazonaws - aws-android-sdk-lex - aar - AWS SDK for Android - Amazon Lex - The AWS Android SDK for Amazon Lex - http://aws.amazon.com/mobile/sdk - - - com.amazonaws - aws-android-sdk-pom - 2.16.13 - - - - - - AWS Customer Agreement - https://aws.amazon.com/agreement/ - - - Apache License, Version 2.0 - http://aws.amazon.com/apache2.0 - repo - - - - - - com.amazonaws - aws-android-sdk-core - false - 2.16.13 - - - com.google.android - android - 4.1.1.4 - provided - - - com.google.guava - guava - false - 20.0 - - - junit - junit - 4.12 - test - - - org.easymock - easymock - 3.1 - test - - - - - - com.simpligility.maven.plugins - android-maven-plugin - 4.5.0 - true - - - ${env.ANDROID_PLATFORM} - ${env.ANDROID_BUILDTOOL_VERSION} - - ${project.basedir}/src/main/jniLibs - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - \ No newline at end of file + aws-android-sdk-pom + 2.16.13 + + + + + AWS Customer Agreement + https://aws.amazon.com/agreement/ + + + Apache License, Version 2.0 + http://aws.amazon.com/apache2.0 + repo + + + + + com.amazonaws + aws-android-sdk-core + false + 2.16.13 + + + com.google.android + android + 4.1.1.4 + provided + + + com.google.guava + guava + false + 20.0 + + + junit + junit + 4.12 + test + + + org.easymock + easymock + 3.1 + test + + + + + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + ${project.basedir}/src/main/jniLibs + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + diff --git a/aws-android-sdk-logs/build.gradle b/aws-android-sdk-logs/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-logs/build.gradle +++ b/aws-android-sdk-logs/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-logs/pom.xml b/aws-android-sdk-logs/pom.xml index d80d56b0f8..4824da1ed1 100644 --- a/aws-android-sdk-logs/pom.xml +++ b/aws-android-sdk-logs/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-logs - jar + aar AWS SDK for Android - Amazon CloudWatch Logs The AWS Java SDK for Amazon CloudWatch Logs module holds the client classes that are used for communicating with Amazon CloudWatch Logs Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-logs/src/main/AndroidManifest.xml b/aws-android-sdk-logs/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..930cfca92b --- /dev/null +++ b/aws-android-sdk-logs/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-machinelearning/build.gradle b/aws-android-sdk-machinelearning/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-machinelearning/build.gradle +++ b/aws-android-sdk-machinelearning/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-machinelearning/pom.xml b/aws-android-sdk-machinelearning/pom.xml index 8e55368a79..439631856d 100644 --- a/aws-android-sdk-machinelearning/pom.xml +++ b/aws-android-sdk-machinelearning/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-machinelearning - jar + aar AWS SDK for Android - Amazon Machine Learning The AWS Android SDK for Amazon Machine Learning module holds the client classes that are used for communicating with Amazon Machine Learning Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-machinelearning/src/main/AndroidManifest.xml b/aws-android-sdk-machinelearning/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..615d2e3cd8 --- /dev/null +++ b/aws-android-sdk-machinelearning/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-mobile-client/build.gradle b/aws-android-sdk-mobile-client/build.gradle index eb00e72787..479f42d7fd 100644 --- a/aws-android-sdk-mobile-client/build.gradle +++ b/aws-android-sdk-mobile-client/build.gradle @@ -22,10 +22,6 @@ android { lintOptions { abortOnError false } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 - } } devicefarm { diff --git a/aws-android-sdk-mobile-client/pom.xml b/aws-android-sdk-mobile-client/pom.xml index cc6b4f318e..5a2b4213c4 100644 --- a/aws-android-sdk-mobile-client/pom.xml +++ b/aws-android-sdk-mobile-client/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -6,7 +7,6 @@ AWS SDK for Android - AWS Mobile Client The AWS Android SDK for Mobile Client holds the client classes that are used for initializing the SDK and instantiating the SDK clients. http://aws.amazon.com/sdkforandroid - UTF-8 @@ -15,20 +15,17 @@ UTF-8 - google-maven https://maven.google.com - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -37,20 +34,17 @@ 2.16.13 aar - com.android.support support-annotations 27.1.1 - com.amazonaws aws-android-sdk-cognitoidentityprovider false 2.16.13 - com.amazonaws aws-android-sdk-auth-ui @@ -58,7 +52,6 @@ 2.16.13 aar - com.android.support appcompat-v7 @@ -66,7 +59,6 @@ 23.0.1 aar - com.amazonaws aws-android-sdk-auth-google @@ -74,7 +66,6 @@ 2.16.13 aar - com.amazonaws aws-android-sdk-auth-facebook @@ -82,7 +73,6 @@ 2.16.13 aar - com.amazonaws aws-android-sdk-auth-userpools @@ -90,7 +80,6 @@ 2.16.13 aar - com.amazonaws aws-android-sdk-cognitoauth @@ -98,7 +87,6 @@ 2.16.13 aar - com.android.support support-v4 @@ -106,7 +94,6 @@ 23.0.1 aar - com.google.android android @@ -114,7 +101,6 @@ provided - @@ -138,4 +124,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-mobileanalytics/build.gradle b/aws-android-sdk-mobileanalytics/build.gradle index b63073e539..517a8433b5 100644 --- a/aws-android-sdk-mobileanalytics/build.gradle +++ b/aws-android-sdk-mobileanalytics/build.gradle @@ -1,4 +1,27 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } + + lintOptions { + warning 'LongLogTag' + } +} dependencies { api project(':aws-android-sdk-core') @@ -10,6 +33,3 @@ dependencies { testImplementation 'org.robolectric:robolectric:3.8' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-mobileanalytics/pom.xml b/aws-android-sdk-mobileanalytics/pom.xml index 4db6c49894..98cca29b72 100644 --- a/aws-android-sdk-mobileanalytics/pom.xml +++ b/aws-android-sdk-mobileanalytics/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-mobileanalytics - jar + aar AWS SDK for Android - Amazon Mobile Analytics The AWS Android SDK for Amazon Mobile Analytics module holds the client classes that are used for communicating with Amazon Mobile Analytics Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -51,9 +50,20 @@ test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -64,4 +74,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-mobileanalytics/src/main/AndroidManifest.xml b/aws-android-sdk-mobileanalytics/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..44b7d667ef --- /dev/null +++ b/aws-android-sdk-mobileanalytics/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/aws-android-sdk-pinpoint-test/build.gradle b/aws-android-sdk-pinpoint-test/build.gradle index 0ccaab5044..5aa2aa5157 100644 --- a/aws-android-sdk-pinpoint-test/build.gradle +++ b/aws-android-sdk-pinpoint-test/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 10 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-pinpoint/build.gradle b/aws-android-sdk-pinpoint/build.gradle index 914c6cfd20..d9375119a0 100644 --- a/aws-android-sdk-pinpoint/build.gradle +++ b/aws-android-sdk-pinpoint/build.gradle @@ -1,7 +1,27 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') + implementation 'com.android.support:support-v4:27.1.1' testImplementation 'junit:junit:4.12' testImplementation 'org.powermock:powermock-api-mockito:1.6.6' @@ -10,6 +30,3 @@ dependencies { testImplementation 'org.robolectric:robolectric:3.8' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-pinpoint/pom.xml b/aws-android-sdk-pinpoint/pom.xml index f1434f8614..1fe0da0582 100644 --- a/aws-android-sdk-pinpoint/pom.xml +++ b/aws-android-sdk-pinpoint/pom.xml @@ -1,86 +1,83 @@ + - 4.0.0 + 4.0.0 + com.amazonaws + aws-android-sdk-pinpoint + aar + AWS SDK for Android - Amazon Pinpoint + The AWS Android SDK for Amazon Pinpoint module holds the client classes that are used for communicating with Amazon Pinpoint Service + http://aws.amazon.com/sdkforandroid + com.amazonaws - aws-android-sdk-pinpoint - jar - AWS SDK for Android - Amazon Pinpoint - The AWS Android SDK for Amazon Pinpoint module holds the client classes that are used for communicating with Amazon Pinpoint Service - http://aws.amazon.com/sdkforandroid - - - com.amazonaws - aws-android-sdk-pom - 2.16.13 - - - - - com.amazonaws - aws-android-sdk-core - false - 2.16.13 - - - junit - junit - 4.12 - test - - - org.powermock - powermock-module-junit4-rule - 1.6.5 - test - - - org.powermock - powermock-module-junit4 - 1.6.5 - test - - - org.powermock - powermock-api-mockito - 1.6.5 - test - - - org.robolectric - robolectric - 3.4 - test - - - org.hamcrest - hamcrest-all - 1.3 - test - - - com.google.android - android-test - 2.2.1 - test - - - android - android - 5.0 - system - ${env.ANDROID_HOME}/platforms/android-21/android.jar - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - \ No newline at end of file + aws-android-sdk-pom + 2.16.13 + + + + com.amazonaws + aws-android-sdk-core + false + 2.16.13 + + + com.android.support + support-v4 + false + 27.1.1 + + + junit + junit + 4.12 + test + + + org.powermock + powermock-module-junit4-rule + 1.6.6 + test + + + org.powermock + powermock-module-junit4 + 1.6.6 + test + + + org.powermock + powermock-api-mockito + 1.6.6 + test + + + org.robolectric + robolectric + 3.8 + test + + + + + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + diff --git a/aws-android-sdk-pinpoint/src/main/AndroidManifest.xml b/aws-android-sdk-pinpoint/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..50e417f700 --- /dev/null +++ b/aws-android-sdk-pinpoint/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/aws-android-sdk-pinpoint/src/main/java/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClientBase.java b/aws-android-sdk-pinpoint/src/main/java/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClientBase.java index 4b1c25c22c..454d0c2b21 100644 --- a/aws-android-sdk-pinpoint/src/main/java/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClientBase.java +++ b/aws-android-sdk-pinpoint/src/main/java/com/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClientBase.java @@ -30,6 +30,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.support.v4.app.NotificationCompat; import com.amazonaws.mobileconnectors.pinpoint.analytics.AnalyticsEvent; import com.amazonaws.mobileconnectors.pinpoint.internal.core.PinpointContext; @@ -278,11 +279,13 @@ private int getNotificationIconResourceId( private Notification createLegacyNotification(final int iconResId, final String title, final String contentText, final PendingIntent contentIntent) { - final Notification notification = new Notification(); - notification.icon = iconResId; - notification.setLatestEventInfo(this.pinpointContext.getApplicationContext(), title, contentText, contentIntent); - notification.contentIntent = contentIntent; - return notification; + final Context context = this.pinpointContext.getApplicationContext(); + return new NotificationCompat.Builder(context) + .setContentIntent(contentIntent) + .setContentText(contentText) + .setContentTitle(title) + .setSmallIcon(iconResId) + .build(); } private boolean initClassesAndMethodsByReflection() { diff --git a/aws-android-sdk-pinpoint/src/test/resources/robolectric.properties b/aws-android-sdk-pinpoint/src/test/resources/robolectric.properties new file mode 100644 index 0000000000..8cb873d4a0 --- /dev/null +++ b/aws-android-sdk-pinpoint/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=27 diff --git a/aws-android-sdk-polly/build.gradle b/aws-android-sdk-polly/build.gradle index 5d72576cb4..2a6e295157 100644 --- a/aws-android-sdk-polly/build.gradle +++ b/aws-android-sdk-polly/build.gradle @@ -1,12 +1,30 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + useLibrary 'org.apache.http.legacy' + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-all:1.10.5' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-all:1.10.5' + testRuntimeOnly 'org.apache.httpcomponents:httpclient:4.5.12' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-polly/pom.xml b/aws-android-sdk-polly/pom.xml index c1db79a521..41fab1ec6b 100644 --- a/aws-android-sdk-polly/pom.xml +++ b/aws-android-sdk-polly/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-polly - jar + aar AWS SDK for Android - Amazon Polly The AWS Android SDK for Amazon Polly module holds the client classes that are used for communicating with Amazon Polly Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -32,10 +31,27 @@ 1.10.5 test + + org.apache.httpcomponents + httpclient + 4.5.12 + test + - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -46,4 +62,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-polly/src/main/AndroidManifest.xml b/aws-android-sdk-polly/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..5b18c7a1ef --- /dev/null +++ b/aws-android-sdk-polly/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/aws-android-sdk-rekognition/build.gradle b/aws-android-sdk-rekognition/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-rekognition/build.gradle +++ b/aws-android-sdk-rekognition/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-rekognition/pom.xml b/aws-android-sdk-rekognition/pom.xml index 50bb1443ea..63aad10fd0 100644 --- a/aws-android-sdk-rekognition/pom.xml +++ b/aws-android-sdk-rekognition/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-rekognition - jar + aar AWS SDK for Android - Amazon Rekognition The AWS Android SDK for Amazon Rekognition module holds the client classes that are used for communicating with Amazon Rekognition Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -33,9 +32,20 @@ test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -46,4 +56,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-rekognition/src/main/AndroidManifest.xml b/aws-android-sdk-rekognition/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..962a8295cc --- /dev/null +++ b/aws-android-sdk-rekognition/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-s3-test/build.gradle b/aws-android-sdk-s3-test/build.gradle index 13c167cef7..a0719c4c39 100644 --- a/aws-android-sdk-s3-test/build.gradle +++ b/aws-android-sdk-s3-test/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 21 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' @@ -19,7 +19,6 @@ android { } } - useLibrary 'org.apache.http.legacy' packagingOptions { exclude 'META-INF/DEPENDENCIES' } diff --git a/aws-android-sdk-s3/build.gradle b/aws-android-sdk-s3/build.gradle index 2f8d80f185..ac6edf9b10 100644 --- a/aws-android-sdk-s3/build.gradle +++ b/aws-android-sdk-s3/build.gradle @@ -1,4 +1,24 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + useLibrary 'org.apache.http.legacy' + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') @@ -10,11 +30,6 @@ dependencies { testImplementation 'org.apache.commons:commons-io:1.3.2' testImplementation 'org.mockito:mockito-all:1.10.5' testImplementation 'org.robolectric:robolectric:3.8' + testRuntimeOnly 'org.apache.httpcomponents:httpclient:4.5.12' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - -compileJava.options.encoding = 'UTF-8' -compileTestJava.options.encoding = 'UTF-8' - diff --git a/aws-android-sdk-s3/pom.xml b/aws-android-sdk-s3/pom.xml index 5c0fb5b589..68beabac6c 100644 --- a/aws-android-sdk-s3/pom.xml +++ b/aws-android-sdk-s3/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-s3 - jar + aar AWS SDK for Android - Amazon S3 The AWS Android SDK for Amazon S3 module holds the client classes that are used for communicating with Amazon Simple Storage Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -26,12 +25,30 @@ false 2.16.13 + + commons-logging + commons-logging + 1.1.1 + test + + + joda-time + joda-time + 2.0 + test + junit junit 4.12 test + + org.apache.commons + commons-io + 1.3.2 + test + org.mockito mockito-all @@ -41,37 +58,30 @@ org.robolectric robolectric - 3.4 + 3.8 test - org.hamcrest - hamcrest-all - 1.3 - test - - - joda-time - joda-time - 2.0 - test - - - org.apache.commons - commons-io - 1.3.2 - test - - - commons-io - commons-io - 2.4 + org.apache.httpcomponents + httpclient + 4.5.12 test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -82,4 +92,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-s3/src/main/AndroidManifest.xml b/aws-android-sdk-s3/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..e3fcfa4c23 --- /dev/null +++ b/aws-android-sdk-s3/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/aws-android-sdk-s3/src/test/java/com/amazonaws/services/s3/util/MimetypesTest.java b/aws-android-sdk-s3/src/test/java/com/amazonaws/services/s3/util/MimetypesTest.java index 9744f3493c..3ae8b1ec03 100644 --- a/aws-android-sdk-s3/src/test/java/com/amazonaws/services/s3/util/MimetypesTest.java +++ b/aws-android-sdk-s3/src/test/java/com/amazonaws/services/s3/util/MimetypesTest.java @@ -22,39 +22,10 @@ import org.junit.Test; import java.io.InputStream; -import java.lang.management.ManagementFactory; import java.util.List; -import javax.management.Attribute; -import javax.management.AttributeList; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; - public class MimetypesTest { - /** Tests that we aren't leaking file descriptors. */ - @Test - public void testFileDescriptorLeaks() throws Exception { - long fd = getOpenFileDecriptorCount(); - Mimetypes mt = Mimetypes.getInstance(); - long fd2 = getOpenFileDecriptorCount(); - // If fd2 is greater than fd, then we've detected a leak - assertFalse(fd2 > fd); - - InputStream is = Mimetypes.class.getResourceAsStream("/mime.types"); - long fd3 = getOpenFileDecriptorCount(); - // An additional fd still opened - assertTrue(fd2 < fd3); - mt.loadAndReplaceMimetypes(is); - long fd4 = getOpenFileDecriptorCount(); - assertTrue("fd3=" + fd3 + ", fd4=" + fd4, fd3 >= fd4); - is.close(); - // All additional fd closed - long fd5 = getOpenFileDecriptorCount(); - assertFalse("fd5=" + fd5 + ", fd=" + fd, fd5 > fd); - } - /** Tests that file names with mixed case are detected correctly. */ @Test public void testExtensionsWithCaps() throws Exception { @@ -86,24 +57,5 @@ public void testRegisterMimetypeOverwrite() { mt.registerMimetype("jpeg", mimetype); assertEquals("new mimetype", mimetype, mt.getMimetype("image.jpeg")); } - - private long getOpenFileDecriptorCount() throws Exception { - MBeanServer mbsc = getMBeanServer(); - AttributeList attributes; - attributes = mbsc.getAttributes( - new ObjectName("java.lang:type=OperatingSystem"), - new String[] { - "OpenFileDescriptorCount" - }); - List attrList = attributes.asList(); - return (Long) attrList.get(0).getValue(); - } - - private static MBeanServer getMBeanServer() { - List servers = MBeanServerFactory.findMBeanServer(null); - MBeanServer server = servers.size() > 0 - ? servers.get(0) - : ManagementFactory.getPlatformMBeanServer(); - return server; - } } + diff --git a/aws-android-sdk-s3/src/test/resources/robolectric.properties b/aws-android-sdk-s3/src/test/resources/robolectric.properties new file mode 100644 index 0000000000..8cb873d4a0 --- /dev/null +++ b/aws-android-sdk-s3/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=27 diff --git a/aws-android-sdk-sagemaker-runtime/build.gradle b/aws-android-sdk-sagemaker-runtime/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-sagemaker-runtime/build.gradle +++ b/aws-android-sdk-sagemaker-runtime/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-sagemaker-runtime/pom.xml b/aws-android-sdk-sagemaker-runtime/pom.xml index 3fd02e66ee..7150a6e7dd 100644 --- a/aws-android-sdk-sagemaker-runtime/pom.xml +++ b/aws-android-sdk-sagemaker-runtime/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-sagemaker-runtime - jar + aar AWS SDK for Android - Amazon SageMaker Runtime The AWS Android SDK for Amazon SageMaker Runtime module holds the client classes that are used for communicating with Amazon SageMaker Runtime Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-sagemaker-runtime/src/main/AndroidManifest.xml b/aws-android-sdk-sagemaker-runtime/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..46f1ca383d --- /dev/null +++ b/aws-android-sdk-sagemaker-runtime/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-sdb/build.gradle b/aws-android-sdk-sdb/build.gradle index 5d72576cb4..06b0d2f008 100644 --- a/aws-android-sdk-sdb/build.gradle +++ b/aws-android-sdk-sdb/build.gradle @@ -1,12 +1,29 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-all:1.10.5' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-all:1.10.5' + testImplementation 'org.robolectric:robolectric:3.8' } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-sdb/pom.xml b/aws-android-sdk-sdb/pom.xml index 76366693d7..0640e424bb 100644 --- a/aws-android-sdk-sdb/pom.xml +++ b/aws-android-sdk-sdb/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-sdb - jar + aar AWS SDK for Android - Amazon SimpleDB The AWS Android SDK for Amazon SimpleDB module holds the client classes that are used for communicating with Amazon SimpleDB Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -20,22 +19,39 @@ false 2.16.13 - - junit - junit - 4.12 - test + + junit + junit + 4.12 + test + + + org.mockito + mockito-all + 1.10.5 + test - org.mockito - mockito-all - 1.10.5 - test + org.robolectric + robolectric + 3.8 + test - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -46,4 +62,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-sdb/src/main/AndroidManifest.xml b/aws-android-sdk-sdb/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..e1ce9652ce --- /dev/null +++ b/aws-android-sdk-sdb/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-sdb/src/test/java/com/amazonaws/services/simpledb/AmazonSimpleDBUnmarshallersTest.java b/aws-android-sdk-sdb/src/test/java/com/amazonaws/services/simpledb/AmazonSimpleDBUnmarshallersTest.java index 9d8c811a02..41925cbad5 100644 --- a/aws-android-sdk-sdb/src/test/java/com/amazonaws/services/simpledb/AmazonSimpleDBUnmarshallersTest.java +++ b/aws-android-sdk-sdb/src/test/java/com/amazonaws/services/simpledb/AmazonSimpleDBUnmarshallersTest.java @@ -6,6 +6,8 @@ import static org.junit.Assert.*; import org.junit.After; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserFactory; @@ -30,6 +32,7 @@ * * Auto-generated */ +@RunWith(RobolectricTestRunner.class) public class AmazonSimpleDBUnmarshallersTest { @@ -262,4 +265,4 @@ private ByteBuffer getExpectedByteBuffer() { } } - \ No newline at end of file + diff --git a/aws-android-sdk-sdb/src/test/resources/robolectric.properties b/aws-android-sdk-sdb/src/test/resources/robolectric.properties new file mode 100644 index 0000000000..8cb873d4a0 --- /dev/null +++ b/aws-android-sdk-sdb/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=27 diff --git a/aws-android-sdk-ses/build.gradle b/aws-android-sdk-ses/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-ses/build.gradle +++ b/aws-android-sdk-ses/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-ses/pom.xml b/aws-android-sdk-ses/pom.xml index ba60b882ef..2bc18d5dd2 100644 --- a/aws-android-sdk-ses/pom.xml +++ b/aws-android-sdk-ses/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-ses - jar + aar AWS SDK for Android - Amazon SES The AWS Android SDK for Amazon SES module holds the client classes that are used for communicating with Amazon Simple Email Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-ses/src/main/AndroidManifest.xml b/aws-android-sdk-ses/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..e331aa8db3 --- /dev/null +++ b/aws-android-sdk-ses/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/aws-android-sdk-sns/build.gradle b/aws-android-sdk-sns/build.gradle index 848369a457..3ea19c4fb9 100644 --- a/aws-android-sdk-sns/build.gradle +++ b/aws-android-sdk-sns/build.gradle @@ -1,10 +1,26 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') api project(':aws-android-sdk-sqs') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-sns/pom.xml b/aws-android-sdk-sns/pom.xml index 02a6aed700..592a517989 100644 --- a/aws-android-sdk-sns/pom.xml +++ b/aws-android-sdk-sns/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-sns - jar + aar AWS SDK for Android - Amazon SNS The AWS Android SDK for Amazon SNS module holds the client classes that are used for communicating with Amazon Simple Notification Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -27,9 +26,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -40,4 +50,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-sns/src/main/AndroidManifest.xml b/aws-android-sdk-sns/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..dfc9fae088 --- /dev/null +++ b/aws-android-sdk-sns/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-sqs/build.gradle b/aws-android-sdk-sqs/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-sqs/build.gradle +++ b/aws-android-sdk-sqs/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-sqs/pom.xml b/aws-android-sdk-sqs/pom.xml index a744e17d70..2de821ac79 100644 --- a/aws-android-sdk-sqs/pom.xml +++ b/aws-android-sdk-sqs/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-sqs - jar + aar AWS SDK for Android - Amazon SQS The AWS Android SDK for Amazon SQS module holds the client classes that are used for communicating with Amazon Simple Queue Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-sqs/src/main/AndroidManifest.xml b/aws-android-sdk-sqs/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..3c39c8ea88 --- /dev/null +++ b/aws-android-sdk-sqs/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-testutils/build.gradle b/aws-android-sdk-testutils/build.gradle index 67b8fd85a5..4162c821d7 100644 --- a/aws-android-sdk-testutils/build.gradle +++ b/aws-android-sdk-testutils/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 10 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName '1.0' diff --git a/aws-android-sdk-textract/build.gradle b/aws-android-sdk-textract/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-textract/build.gradle +++ b/aws-android-sdk-textract/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-textract/pom.xml b/aws-android-sdk-textract/pom.xml index 465ebf4e06..11a92c6794 100644 --- a/aws-android-sdk-textract/pom.xml +++ b/aws-android-sdk-textract/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-textract - jar + aar AWS SDK for Android - Amazon Textract The AWS Android SDK for Amazon Textract module holds the client classes that are used for communicating with Amazon Textract Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-textract/src/main/AndroidManifest.xml b/aws-android-sdk-textract/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..a048fdd011 --- /dev/null +++ b/aws-android-sdk-textract/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/aws-android-sdk-transcribe/build.gradle b/aws-android-sdk-transcribe/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-transcribe/build.gradle +++ b/aws-android-sdk-transcribe/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-transcribe/pom.xml b/aws-android-sdk-transcribe/pom.xml index 54c4a10664..45dceea232 100644 --- a/aws-android-sdk-transcribe/pom.xml +++ b/aws-android-sdk-transcribe/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-transcribe - jar + aar AWS SDK for Android - Amazon Transcribe The AWS Android SDK for Amazon Transcribe module holds the client classes that are used for communicating with Amazon Transcribe Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-transcribe/src/main/AndroidManifest.xml b/aws-android-sdk-transcribe/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..b7bdad5b6d --- /dev/null +++ b/aws-android-sdk-transcribe/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/aws-android-sdk-translate/build.gradle b/aws-android-sdk-translate/build.gradle index 673d68b1b9..6f6a431845 100644 --- a/aws-android-sdk-translate/build.gradle +++ b/aws-android-sdk-translate/build.gradle @@ -1,9 +1,25 @@ -apply plugin: 'java-library' +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 15 + 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' + } + } +} dependencies { api project(':aws-android-sdk-core') } -sourceCompatibility = '1.7' -targetCompatibility = '1.7' - diff --git a/aws-android-sdk-translate/pom.xml b/aws-android-sdk-translate/pom.xml index 17a85e01df..e643302669 100644 --- a/aws-android-sdk-translate/pom.xml +++ b/aws-android-sdk-translate/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 com.amazonaws aws-android-sdk-translate - jar + aar AWS SDK for Android - Amazon Translate The AWS Android SDK for Amazon Translate module holds the client classes that are used for communicating with Amazon Translate Service http://aws.amazon.com/sdkforandroid - com.amazonaws aws-android-sdk-pom 2.16.13 - com.amazonaws @@ -21,9 +20,20 @@ 2.16.13 - + + com.simpligility.maven.plugins + android-maven-plugin + 4.5.0 + true + + + ${env.ANDROID_PLATFORM} + ${env.ANDROID_BUILDTOOL_VERSION} + + + org.apache.maven.plugins maven-compiler-plugin @@ -34,4 +44,4 @@ - \ No newline at end of file + diff --git a/aws-android-sdk-translate/src/main/AndroidManifest.xml b/aws-android-sdk-translate/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..c63fa4726e --- /dev/null +++ b/aws-android-sdk-translate/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/pom.xml b/pom.xml index 4065f19f98..dc4b14199c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 com.amazonaws @@ -5,9 +6,8 @@ pom AWS SDK for Android 2.16.13 - The Amazon Web Services SDK for Android provides Android APIs for building software on AWS’ cost-effective, scalable, and reliable infrastructure products. The AWS SDK for Android allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Auto Scaling, etc). + The Amazon Web Services SDK for Android provides Android APIs for building software on AWS’ cost-effective, scalable, and reliable infrastructure products. The AWS SDK for Android allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Auto Scaling, etc). http://aws.amazon.com/sdkforandroid - UTF-8 @@ -16,11 +16,9 @@ UTF-8 - http://github.com/aws/aws-sdk-android.git - Apache License, Version 2.0 @@ -28,7 +26,6 @@ repo - aws-android-sdk-apigateway-core aws-android-sdk-auth-core @@ -75,7 +72,6 @@ aws-android-sdk-transcribe aws-android-sdk-translate - amazonwebservices @@ -86,7 +82,6 @@ - com.google.android @@ -95,7 +90,6 @@ provided - @@ -111,12 +105,12 @@ - org.apache.maven.plugins - maven-surefire-plugin - - false - - + org.apache.maven.plugins + maven-surefire-plugin + + false + + org.apache.maven.plugins maven-javadoc-plugin @@ -128,21 +122,20 @@ - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - - + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + - publishing @@ -163,8 +156,8 @@ - --pinentry-mode - loopback + --pinentry-mode + loopback @@ -191,4 +184,4 @@ - \ No newline at end of file +