Skip to content

Commit b855ea2

Browse files
authored
Updated to SDK 33, kotlin and Sentry dependencies (#108)
1 parent 43adb6e commit b855ea2

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on the Steamclock [Release Management Guide](https://github.com/steamclock/labs/wiki/Release-Management-Guide).
55

6-
## Unreleased
6+
## v2.2 Unreleased
7+
- Updated to SDK 33, kotlin and Sentry dependencies (#108)
8+
9+
---
10+
11+
## Jitpack v2.1 : Aug 30, 2022
712

813
- Updated libraries including Sentry (#101)
914
- Replaced kotlin synthetics with ViewBinding in sample app (#47)

app/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ plugins {
1212
}
1313

1414
android {
15-
compileSdkVersion 31 // Android 12 (2021)
16-
buildToolsVersion "31.0.0"
15+
compileSdkVersion versions.compileSdk
1716

1817
kotlinOptions {
1918
jvmTarget = "1.8"
@@ -26,7 +25,7 @@ android {
2625
defaultConfig {
2726
applicationId "com.steamclock.steamclogsample"
2827
minSdkVersion 21
29-
targetSdkVersion 31 // Android 12 (2021)
28+
targetSdkVersion versions.compileSdk
3029
versionCode 1
3130
versionName "1.0"
3231
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -48,7 +47,6 @@ android {
4847
dependencies {
4948
implementation project(':steamclog')
5049
// Since Sentry is a dependency of steamclog, we do not have to import it again
51-
5250
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2'
5351
implementation 'androidx.appcompat:appcompat:1.4.1'
5452
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

build.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.7.10'
4-
ext.timber = '5.0.1'
5-
ext.sentry = '6.4.0'
3+
4+
ext.versions = [
5+
"compileSdk": 33,
6+
"kotlin": "1.8.10",
7+
"timber": "5.0.1",
8+
"sentry": "6.17.0"
9+
]
610

711
repositories {
812
google()
@@ -11,7 +15,7 @@ buildscript {
1115

1216
dependencies {
1317
classpath 'com.android.tools.build:gradle:7.0.4'
14-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
18+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
1519
// NOTE: Do not place your application dependencies here; they belong
1620
// in the individual module build.gradle files
1721
}

steamclog/build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ afterEvaluate {
1818
// You can then customize attributes of the publication as shown below.
1919
groupId = 'com.steamclock.steamclog'
2020
artifactId = 'release'
21-
version = 'v2.1'
21+
version = 'v2.2'
2222
}
2323
}
2424
}
2525
}
2626

2727
android {
28-
compileSdkVersion 31 // Android 12 (2021)
29-
buildToolsVersion "31.0.0"
28+
compileSdkVersion versions.compileSdk
3029

3130
// ADD COMPATIBILITY OPTIONS TO BE COMPATIBLE WITH JAVA 1.8
3231
// Added for Sentry support
@@ -37,9 +36,9 @@ android {
3736

3837
defaultConfig {
3938
minSdkVersion 21
40-
targetSdkVersion 31 // Android 12 (2021)
41-
versionCode 2
42-
versionName "1.1"
39+
targetSdkVersion versions.compileSdk
40+
versionCode 3
41+
versionName "2.2"
4342
consumerProguardFiles "consumer-rules.pro"
4443
}
4544

@@ -59,9 +58,9 @@ dependencies {
5958
implementation fileTree(dir: "libs", include: ["*.jar"])
6059
// https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/
6160
// No longer need to include kotlin stdlib dependency
62-
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
61+
implementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
6362

64-
implementation "com.jakewharton.timber:timber:$timber"
63+
implementation "com.jakewharton.timber:timber:${versions.timber}"
6564
// https://github.com/getsentry/sentry-java/releases
66-
implementation "io.sentry:sentry-android:$sentry"
65+
implementation "io.sentry:sentry-android:${versions.sentry}"
6766
}

0 commit comments

Comments
 (0)