Skip to content
This repository was archived by the owner on Jun 28, 2019. It is now read-only.

Commit 50a14e2

Browse files
authored
Merge pull request #12 from studyplus/release/2.2.1
Release/2.2.1
2 parents c5814e7 + 6969131 commit 50a14e2

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.10'
4+
ext.kotlin_version = '1.3.21'
55
ext.versions = [
66
'compileSdk': 27,
77
'minSdk': 16,
@@ -14,7 +14,7 @@ buildscript {
1414
jcenter()
1515
}
1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:3.2.1'
17+
classpath 'com.android.tools.build:gradle:3.3.2'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Oct 30 15:28:34 JST 2018
1+
#Wed Mar 27 11:30:00 JST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

studyplus-android-sdk2/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ dependencies {
7272
implementation fileTree(dir: 'libs', include: ['*.jar'])
7373
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
7474

75-
def coroutines = "1.0.1"
75+
def coroutines = "1.1.1"
7676
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
7777
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
7878

79-
def okhttp = "3.12.0"
79+
def okhttp = "3.12.1"
8080
implementation "com.squareup.okhttp3:okhttp:$okhttp"
8181

8282
testImplementation 'junit:junit:4.12'

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/record/StudyRecord.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class StudyRecord {
1919
put("recorded_at", recordedTime)
2020
put("duration", duration)
2121
put("comment", comment)
22-
put("amountTotal", amountTotal)
22+
put("amount", amountTotal)
2323
put("start_position", startPosition)
2424
put("end_position", endPosition)
2525
}.toString()

0 commit comments

Comments
 (0)