Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.idea/
15 changes: 6 additions & 9 deletions BasicSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,20 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.21'
ext.kotlin_version = '1.3.50'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
ext {
// SDK and tools
compileSdkVersion = 28
compileSdkVersion = 29
minSdkVersion = 21
targetSdkVersion = 28
targetSdkVersion = 29

// App dependencies
androidXTestVersion = '1.1.1'
Expand All @@ -45,9 +42,9 @@ buildscript {
kotlinVersion = '1.3.21'
runnerExtVersion = '1.1.0'
rulesVersion = '1.0.1'
appCompatVersion = '1.0.2'
appCompatVersion = '1.1.0'
supportLibraryVersion = '1.0.2'
archLifecycleVersion = '2.1.0-alpha03'
archLifecycleVersion = '2.2.0-rc01'
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicSample/gradle/wrapper/gradle-wrapper.properties
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-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
1 change: 0 additions & 1 deletion TwoWaySample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
implementation "androidx.appcompat:appcompat:$appCompatVersion"
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"

implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion"

testImplementation "junit:junit:$junitVersion"
Expand Down
2 changes: 1 addition & 1 deletion TwoWaySample/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<string name="pause">Pause</string>
<string name="minus_sign">-</string>
<string name="plus_sign">+</string>
<string name="sets_format">Sets: %d/%d</string>
<string name="sets_format" formatted="false">Sets: %d/%d</string>
<string name="prefs_timePerWorkSet">SHARED_PREFS_TIMEPERWORKSET</string>
<string name="prefs_timePerRestSet">SHARED_PREFS_TIMEPERRESTSET</string>
<string name="prefs_numberOfSets">SHARED_PREFS_NUMBEROFSETS</string>
Expand Down
12 changes: 6 additions & 6 deletions TwoWaySample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
buildscript {
ext {
// SDK and tools
compileSdkVersion = 28
compileSdkVersion = 29
minSdkVersion = 21
targetSdkVersion = 28
targetSdkVersion = 29

// App dependencies
androidXTestVersion = '1.1.1'
constraintLayoutVersion = '1.1.3'
espressoVersion = '3.1.0-alpha4'
gradleVersion = '3.3.1'
gradleVersion = '3.5.1'
junitVersion = '4.12'
hamcrestVersion = '1.3'
kotlinVersion = '1.3.21'
kotlinVersion = '1.3.50'
runnerExtVersion = '1.1.0'
rulesVersion = '1.0.1'
appCompatVersion = '1.0.2'
appCompatVersion = '1.1.0'
supportLibraryVersion = '1.0.2'
archLifecycleVersion = '2.1.0-alpha03'
archLifecycleVersion = '2.2.0-rc01'
}

repositories {
Expand Down
4 changes: 2 additions & 2 deletions TwoWaySample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Mar 29 14:34:40 CET 2019
#Fri Oct 25 03:39:52 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip