Skip to content

Changes required to build latest version for android #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 24, 2022
Merged

Changes required to build latest version for android #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d68aa4
update references to crt 0.15.11 and jackson 2.13.0
bgklika Dec 16, 2021
d9a3031
added greengrass sources to android build; change android tools versi…
bgklika Dec 16, 2021
4bcdd15
add publishing to local maven; save old versions of tools
bgklika Dec 21, 2021
b6f4943
Rolling back pom file changes.
prubcheuski Jan 12, 2022
e635e80
Ready to pushing repo to mavenCentral.
prubcheuski Jan 12, 2022
b2ceb66
Roll back original minSDKversion to 26.
prubcheuski Jan 14, 2022
008ed3a
Added event-stream-rpc-server source.
prubcheuski Jan 14, 2022
fddf49f
Remove old commented lines in gradle files; restore maven repo and SN…
bgklika Jan 24, 2022
8867323
Merge branch 'main' into feature/android
graebm Jan 24, 2022
5ae904e
make tests go
graebm Jan 24, 2022
10ab78b
Merge branch 'main' into feature/android
graebm Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 29
buildToolsVersion "29.0.3"
compileSdkVersion 30
buildToolsVersion "30.0.2"

defaultConfig {
applicationId "software.amazon.awssdk.iotsamples"
minSdkVersion 26
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName "1.0"
ndkVersion "21.0.6113669"
ndkVersion "23.1.7779620"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -37,20 +37,19 @@ android {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

ndkVersion '23.1.7779620'
}

repositories {
mavenLocal()
mavenCentral()
maven {
url System.getenv('HOME') + "/.m2/repository"
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(":iotdevicesdk")
implementation 'software.amazon.awssdk.crt:android:0.15.8'
implementation 'software.amazon.awssdk.crt:aws-crt-android:0.15.11'

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core:1.2.0'
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "com.android.tools.build:gradle:7.0.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -20,7 +20,7 @@ allprojects {
repositories {
google()
jcenter()

mavenCentral()
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
43 changes: 26 additions & 17 deletions android/iotdevicesdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,52 +42,56 @@ ext {
}

android {
compileSdkVersion 29
buildToolsVersion "29.0.3"
compileSdkVersion 30
buildToolsVersion "30.0.2"

defaultConfig {
minSdkVersion 26
targetSdkVersion 29
targetSdkVersion 30
versionCode = gitVersionCode()
versionName = gitVersionName()
ndkVersion "21.0.6113669"
ndkVersion "23.1.7779620"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
}

sourceSets {
main {
java.srcDir '../../sdk/src/main/java'
main.java {
srcDirs = ['../../sdk/src/main/java',
'../../sdk/greengrass/event-stream-rpc-model/src/main/java',
'../../sdk/greengrass/event-stream-rpc-client/src/main/java',
'../../sdk/greengrass/event-stream-rpc-server/src/main/java',
'../../sdk/greengrass/greengrass-client/src/event-stream-rpc-java/client',
'../../sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model'
]
}
}

buildTypes {
debug {
versionNameSuffix = gitVersionTag()
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
versionNameSuffix ""
}
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
ndkVersion '23.1.7779620'
}

repositories {
mavenLocal()
mavenCentral()
maven {
url System.getenv('HOME') + "/.m2/repository"
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'software.amazon.awssdk.crt:android:0.15.8'
implementation 'software.amazon.awssdk.crt:aws-crt-android:0.15.11'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
Expand Down Expand Up @@ -128,23 +132,28 @@ afterEvaluate {
from components.release

groupId = 'software.amazon.awssdk.iotdevicesdk'
artifactId = 'android'
artifactId = 'aws-iot-device-sdk-android'
version = android.defaultConfig.versionName
}


debug(MavenPublication) {
from components.debug

groupId = 'software.amazon.awssdk.iotdevicesdk'
artifactId = 'android'
artifactId = 'aws-iot-device-sdk-android'
version = android.defaultConfig.versionName + '-SNAPSHOT'
}

}
repositories {
maven {
def snapshotRepo = "https://aws.oss.sonatype.org/content/repositories/snapshots"
def releaseRepo = "https://aws.oss.sonatype.org/"
url = version.endsWith('SNAPSHOT') ? snapshotRepo : releaseRepo
}
mavenLocal()

}
}
}