Skip to content
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

fixed java version to be same in both gradle files #1861

Merged
merged 7 commits into from
Feb 7, 2025
Merged

fixed java version to be same in both gradle files #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc53ce3
fixed java version to be same in both gradle files
TheNoumanDev Feb 5, 2025
62872ea
Merge branch 'main' into buildConfigFix
TheNoumanDev Feb 5, 2025
269adae
chore: update Kotlin version to 2.1.10 in build.gradle
sharjeelyunus Feb 6, 2025
cd305d7
Update build.gradle
TheNoumanDev Feb 6, 2025
76db6f7
Update settings.gradle
TheNoumanDev Feb 6, 2025
ee74985
updated java version
TheNoumanDev Feb 6, 2025
b1c23e1
Revert "updated java version"
TheNoumanDev Feb 6, 2025
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
6 changes: 3 additions & 3 deletions starter/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.9.10'
ext.kotlin_version = '2.1.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -25,7 +25,7 @@ subprojects {
Integer pluginCompileSdk = project.android.compileSdk
if (pluginCompileSdk != null && pluginCompileSdk < 34) {

def javaVersion = JavaVersion.VERSION_17
def javaVersion = JavaVersion.VERSION_1_8
project.android {
compileSdk 34
if (namespace == null) {
Expand Down
4 changes: 2 additions & 2 deletions starter/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
id "com.android.application" version "8.1.0" apply false
id "org.jetbrains.kotlin.android" version "2.1.10" apply false
}

include ":app"