Skip to content

Commit

Permalink
chore: add java target version
Browse files Browse the repository at this point in the history
  • Loading branch information
wasabeef committed Apr 27, 2023
1 parent 8a01200 commit 5e91215
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dart 2.19.6
flutter 3.7.12
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"dart.flutterSdkPath": "~/.asdf/installs/flutter/3.3.0-stable",
"dart.sdkPath": "~/.asdf/installs/dart/2.18.0/dart-sdk"
"dart.flutterSdkPath": "~/.asdf/installs/flutter/3.7.12-stable",
"dart.sdkPath": "~/.asdf/installs/dart/2.19.6/dart-sdk"
}
17 changes: 10 additions & 7 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ group 'jp.wasabeef.ua.client_hints'
version '1.1.3'

buildscript {
ext.kotlin_version = '1.8.21'
ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -27,17 +27,20 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 33

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 22
minSdkVersion 21
}
lintOptions {
disable 'InvalidPackage'
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.useAndroidX=false
android.enableJetifier=false
4 changes: 2 additions & 2 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {

defaultConfig {
applicationId "jp.wasabeef.ua"
minSdkVersion 22
minSdkVersion 21
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand All @@ -57,5 +57,5 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.8.21'
ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@ packages:
version: "2.1.4"
sdks:
dart: ">=2.18.0 <4.0.0"
flutter: ">=2.10.0"
flutter: ">=3.0.0"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ issue_tracker: https://github.com/wasabeef/flutter_ua_client_hints/issues

environment:
sdk: '>=2.17.0 <3.0.0'
flutter: '>=2.10.0'
flutter: '>=3.0.0'

dependencies:
flutter:
Expand Down

0 comments on commit 5e91215

Please sign in to comment.