Skip to content

Commit d09b75d

Browse files
authored
Merge pull request #288 from fatihergin/feature/viewbinding-and-sdk-34-migration
Feature/viewbinding and sdk 34 migration
2 parents aedb86b + 0bab263 commit d09b75d

8 files changed

Lines changed: 206 additions & 153 deletions

File tree

app/build.gradle

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
def keystorePropertiesFile = rootProject.file("keystore.properties")
65
def keystoreProperties = new Properties()
@@ -9,12 +8,13 @@ if (keystorePropertiesFile.exists()) {
98
}
109

1110
android {
12-
compileSdkVersion 33
11+
namespace "com.simplemobiletools.draw.pro"
12+
compileSdk 34
1313

1414
defaultConfig {
1515
applicationId "com.simplemobiletools.draw.pro"
16-
minSdkVersion 23
17-
targetSdkVersion 33
16+
minSdk 23
17+
targetSdk 34
1818
versionCode 79
1919
versionName "6.9.3"
2020
setProperty("archivesBaseName", "draw")
@@ -32,6 +32,11 @@ android {
3232
}
3333
}
3434

35+
buildFeatures {
36+
buildConfig true
37+
viewBinding true
38+
}
39+
3540
buildTypes {
3641
debug {
3742
applicationIdSuffix ".debug"
@@ -45,7 +50,16 @@ android {
4550
}
4651
}
4752

48-
flavorDimensions "variants"
53+
compileOptions {
54+
sourceCompatibility JavaVersion.VERSION_17
55+
targetCompatibility JavaVersion.VERSION_17
56+
}
57+
58+
kotlinOptions {
59+
jvmTarget = '17'
60+
}
61+
62+
flavorDimensions = ["variants"]
4963
productFlavors {
5064
core {}
5165
fdroid {}
@@ -63,6 +77,6 @@ android {
6377
}
6478

6579
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:4c83ec8740'
80+
implementation 'com.github.SimpleMobileTools:Simple-Commons:0e173dc5ad'
6781
implementation "androidx.print:print:1.0.0"
6882
}

0 commit comments

Comments
 (0)