Skip to content

Commit 160b3e6

Browse files
committed
android: update kotlin
1 parent 9097644 commit 160b3e6

File tree

8 files changed

+25
-18
lines changed

8 files changed

+25
-18
lines changed

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ flutter {
9393
}
9494

9595
dependencies {
96-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21"
96+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.25"
9797
implementation 'com.google.android.material:material:1.9.0'
9898
}
9999

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
id "com.android.application" version "7.4.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.21" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.25" apply false
2323
}
2424

2525
include ":app"

packages/onyxsdk_pen/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group 'com.example.onyxsdk_pen'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.9.10'
5+
ext.kotlin_version = '1.9.25'
66
repositories {
77
google()
88
mavenCentral()
@@ -40,12 +40,12 @@ android {
4040
compileSdk 34
4141

4242
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_1_8
44-
targetCompatibility JavaVersion.VERSION_1_8
43+
sourceCompatibility JavaVersion.VERSION_17
44+
targetCompatibility JavaVersion.VERSION_17
4545
}
4646

4747
kotlinOptions {
48-
jvmTarget = '1.8'
48+
jvmTarget = 17
4949
}
5050

5151
sourceSets {

packages/onyxsdk_pen/example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ android {
2424
ndkVersion flutter.ndkVersion
2525

2626
compileOptions {
27-
sourceCompatibility JavaVersion.VERSION_1_8
28-
targetCompatibility JavaVersion.VERSION_1_8
27+
sourceCompatibility JavaVersion.VERSION_17
28+
targetCompatibility JavaVersion.VERSION_17
2929
}
3030

3131
kotlinOptions {
32-
jvmTarget = '1.8'
32+
jvmTarget = 17
3333
}
3434

3535
sourceSets {

packages/onyxsdk_pen/example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.9.10'
2+
ext.kotlin_version = '1.9.25'
33
repositories {
44
google()
55
mavenCentral()

packages/onyxsdk_pen_dummy/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group 'com.example.onyxsdk_pen'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.9.10'
5+
ext.kotlin_version = '1.9.25'
66
repositories {
77
google()
88
mavenCentral()
@@ -40,12 +40,12 @@ android {
4040
compileSdk 34
4141

4242
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_1_8
44-
targetCompatibility JavaVersion.VERSION_1_8
43+
sourceCompatibility JavaVersion.VERSION_17
44+
targetCompatibility JavaVersion.VERSION_17
4545
}
4646

4747
kotlinOptions {
48-
jvmTarget = '1.8'
48+
jvmTarget = 17
4949
}
5050

5151
sourceSets {

pubspec.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,10 +1279,11 @@ packages:
12791279
receive_sharing_intent:
12801280
dependency: "direct main"
12811281
description:
1282-
name: receive_sharing_intent
1283-
sha256: ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593
1284-
url: "https://pub.dev"
1285-
source: hosted
1282+
path: "."
1283+
ref: deec27f3dd36d6c9f51c22d0026baa7b6f0850a3
1284+
resolved-ref: deec27f3dd36d6c9f51c22d0026baa7b6f0850a3
1285+
url: "https://github.com/ad-angelo/receive_sharing_intent"
1286+
source: git
12861287
version: "1.8.1"
12871288
regexed_validator:
12881289
dependency: "direct main"

pubspec.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ dependency_overrides:
175175
url: https://github.com/adil192/json2yaml
176176
ref: fix-string-ends-with-colon
177177

178+
# https://github.com/KasemJaffer/receive_sharing_intent/pull/333
179+
receive_sharing_intent:
180+
git:
181+
url: https://github.com/ad-angelo/receive_sharing_intent
182+
ref: deec27f3dd36d6c9f51c22d0026baa7b6f0850a3
183+
178184
# For information on the generic Dart part of this file, see the
179185
# following page: https://dart.dev/tools/pub/pubspec
180186

0 commit comments

Comments
 (0)