Skip to content

Commit 5d1b61c

Browse files
committed
Updated from Java to Kotlin and Bug fixes
1 parent 4ea27eb commit 5d1b61c

38 files changed

+592
-638
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
/build
88
/captures
99
.externalNativeBuild
10+
/.idea/*
11+
.idea

.idea/caches/build_file_checksums.ser

535 Bytes
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
23

34
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
5+
compileSdkVersion 30
6+
buildToolsVersion "30.0.2"
67
defaultConfig {
78
applicationId "study.amazons3integration"
8-
minSdkVersion 15
9-
targetSdkVersion 25
9+
minSdkVersion 19
10+
targetSdkVersion 30
1011
versionCode 1
1112
versionName "1.0"
12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1314
}
1415
buildTypes {
1516
release {
@@ -20,14 +21,19 @@ android {
2021
}
2122

2223
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
24+
implementation fileTree(dir: 'libs', include: ['*.jar'])
25+
androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
2526
exclude group: 'com.android.support', module: 'support-annotations'
2627
})
27-
compile 'com.android.support:appcompat-v7:25.2.0'
28-
testCompile 'junit:junit:4.12'
28+
implementation 'androidx.appcompat:appcompat:1.2.0'
29+
testImplementation 'junit:junit:4.12'
2930

30-
compile 'com.amazonaws:aws-android-sdk-s3:2.2.+'
31-
compile 'com.amazonaws:aws-android-sdk-cognito:2.2.+'
32-
compile 'com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.2.+'
31+
implementation 'com.amazonaws:aws-android-sdk-s3:2.18.0'
32+
implementation 'com.amazonaws:aws-android-sdk-cognito:2.18.0'
33+
implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.18.0'
34+
implementation "androidx.core:core-ktx:1.3.1"
35+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
36+
}
37+
repositories {
38+
mavenCentral()
3339
}

app/src/androidTest/java/study/amazons3integration/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
1010

1111
<application
12-
android:allowBackup="true"
1312
android:icon="@mipmap/ic_launcher"
1413
android:label="@string/app_name"
1514
android:supportsRtl="true"

0 commit comments

Comments
 (0)