Skip to content

Feature/kotlin1410 #3

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 6 commits into from
Nov 16, 2020
Merged

Feature/kotlin1410 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d5964e
Update kotlin serialization library
Drjacky Aug 24, 2020
5399e92
[WIP] Upgrade kotlin to 1.4.10
Drjacky Nov 14, 2020
5ed7774
[WIP] Upgrade kotlin to 1.4.20rc
Drjacky Nov 14, 2020
8fc3be4
[WIP] Use kotlin 1.4.0
Drjacky Nov 16, 2020
72b5ec1
[WIP] Downgrade ktor version
Drjacky Nov 16, 2020
e24cedd
Use native-mt-coroutines (#2)
arkivanov Nov 16, 2020
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
4 changes: 3 additions & 1 deletion .idea/artifacts/shared_jvm.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/kotlinc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ tasks.withType<KotlinCompile> {
allprojects {
repositories {
mavenCentral()
maven("https://dl.bintray.com/kodein-framework/kodein-dev")
maven("https://dl.bintray.com/kotlin/kotlinx")
maven("https://dl.bintray.com/kotlin/ktor")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
Expand Down
21 changes: 13 additions & 8 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
# gradle
org.gradle.jvmargs=-Xmx1536m
org.gradle.parallel=true

# kotlin
kotlin.code.style=official
kotlinVersion=1.3.72
kotlinVersion=1.4.0
# 1.3.72
kotlin.incremental.multiplatform=true
kotlin.parallel.tasks.in.project=true
ktorVersion=1.3.2
kotlinSerializationVersion=0.14.0-1.3.70-eap-134
reactiveVersion=1.1.13
coroutinesVersion=1.3.7
kodeinVersion=7.0.0

ktorVersion=1.4.0
# 1.3.2
kotlinSerializationVersion=1.0.1
# 0.20.0
reactiveVersion=1.1.18
reactiveNmtcVersion=1.1.18-nmtc
# 1.1.13
coroutinesVersion=1.3.9-native-mt-2
# 1.3.7
kodeinVersion=7.1.0
# 7.0.0
# android
android.useAndroidX=true
android.enableJetifier=true
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jan 14 20:05:13 IRST 2020
#Sun Nov 01 11:48:21 GMT 2020
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-6.5-bin.zip
Binary file modified ...odeproj/project.xcworkspace/xcuserdata/drjacky.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
23 changes: 23 additions & 0 deletions ...eproj/project.xcworkspace/xcuserdata/drjacky.xcuserdatad/xcdebugger/Expressions.xcexplist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,44 @@
<VariablesViewState
version = "1.0">
<ContextStates>
<ContextState
contextName = "closure #1 in ViewController._viewModel.getter:ViewController.swift">
</ContextState>
<ContextState
contextName = "ViewController.binding():ViewController.swift">
<PersistentStrings>
<PersistentString
value = "result">
</PersistentString>
<PersistentString
value = "_binding">
</PersistentString>
<PersistentString
value = "_viewModel">
</PersistentString>
</PersistentStrings>
</ContextState>
<ContextState
contextName = "closure #1 in ViewController.binding():ViewController.swift">
<PersistentStrings>
<PersistentString
value = "strongSelf._isRefreshing">
</PersistentString>
<PersistentString
value = "_viewModel">
</PersistentString>
<PersistentString
value = "strongSelf">
</PersistentString>
</PersistentStrings>
</ContextState>
<ContextState
contextName = "ViewController.viewDidLoad():ViewController.swift">
<PersistentStrings>
<PersistentString
value = "_viewModel">
</PersistentString>
</PersistentStrings>
</ContextState>
</ContextStates>
</VariablesViewState>
Loading