Skip to content

Commit

Permalink
Kotlin 1.8.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikolay Kochetkov committed Feb 9, 2023
1 parent e63e57b commit 064e96e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.8.10'
ext.dokka_version = '1.7.20'
repositories {
google()
Expand All @@ -12,7 +12,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:7.4.1'
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down Expand Up @@ -74,7 +74,7 @@ allprojects {
"mockative": "1.2.6",

// Compose
"compose_compiler_version": "1.3.2",
"compose_compiler_version": "1.4.2",
"compose_ui_version": '1.3.3',
"compose_ui_tooling_version": '1.3.3',
"compose_ui_foundation_version": '1.3.1',
Expand Down
5 changes: 5 additions & 0 deletions kotlin-js-store/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,11 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"

[email protected]:
version "4.7.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==

[email protected]:
version "6.2.1"
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import kotlinx.serialization.encoding.Encoder
/**
* Serializer for [DataWithCacheKey]
*/
@Serializer(forClass = DataWithCacheKey::class)
@ExperimentalSerializationApi
data class DataWithCacheKeySerializer<D: Any>(val dataSerializer: KSerializer<D>):
KSerializer<DataWithCacheKey<D>> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class NoteFragment : LceFragment<ViewGroup, Note>(), ProvidesNoteId {
/**
* Delete note...
*/
@Deprecated("Deprecated in Java")
override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
R.id.action_delete -> {
Timber.d("Deleting note...")
Expand Down Expand Up @@ -186,12 +187,14 @@ class NoteFragment : LceFragment<ViewGroup, Note>(), ProvidesNoteId {
findItem(R.id.action_delete)?.isVisible = isDeleteVisible
}

@Deprecated("Deprecated in Java")
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
super.onCreateOptionsMenu(menu,inflater)
inflater.inflate(R.menu.menu_fragment_note, menu)
menu.setDeleteVisible()
}

@Deprecated("Deprecated in Java")
override fun onPrepareOptionsMenu(menu: Menu) {
super.onPrepareOptionsMenu(menu)
menu.setDeleteVisible()
Expand Down

0 comments on commit 064e96e

Please sign in to comment.