Skip to content

Commit

Permalink
upgrade to gradle 8.8
Browse files Browse the repository at this point in the history
upgrade kotlin to 1.9
updated to use java 17
updated to target sdk 34
version bump
  • Loading branch information
jchau207 committed May 18, 2024
1 parent 8aaa78b commit b41d473
Show file tree
Hide file tree
Showing 6 changed files with 212 additions and 140 deletions.
21 changes: 13 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
}

repositories {
maven { url "https://jitpack.io" }
}

android {
compileSdkVersion 31
compileSdkVersion 34
defaultConfig {
applicationId "com.bitcoin.merchant.app"
minSdkVersion 21
targetSdkVersion 31
versionCode 50317
versionName "5.3.17"
targetSdkVersion 34
versionCode 50400
versionName "5.4.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildFeatures {
buildConfig = true
}

buildTypes {
release {
minifyEnabled true
Expand All @@ -31,9 +35,10 @@ android {
}
}
android {
namespace "com.bitcoin.merchant.app"
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
lintOptions {
checkReleaseBuilds false
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ buildscript {
jcenter()
maven { url "https://jitpack.io" }
}
ext.kotlin_version = '1.3.70'
ext.kotlin_version = '1.9.21'
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
Loading

0 comments on commit b41d473

Please sign in to comment.