Skip to content

Commit

Permalink
Updated to SDK 33, kotlin and Sentry dependencies (#108)
Browse files Browse the repository at this point in the history
  • Loading branch information
ssawchenko authored Apr 17, 2023
1 parent 43adb6e commit b855ea2
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 18 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file.

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

## Unreleased
## v2.2 Unreleased
- Updated to SDK 33, kotlin and Sentry dependencies (#108)

---

## Jitpack v2.1 : Aug 30, 2022

- Updated libraries including Sentry (#101)
- Replaced kotlin synthetics with ViewBinding in sample app (#47)
Expand Down
6 changes: 2 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ plugins {
}

android {
compileSdkVersion 31 // Android 12 (2021)
buildToolsVersion "31.0.0"
compileSdkVersion versions.compileSdk

kotlinOptions {
jvmTarget = "1.8"
Expand All @@ -26,7 +25,7 @@ android {
defaultConfig {
applicationId "com.steamclock.steamclogsample"
minSdkVersion 21
targetSdkVersion 31 // Android 12 (2021)
targetSdkVersion versions.compileSdk
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -48,7 +47,6 @@ android {
dependencies {
implementation project(':steamclog')
// Since Sentry is a dependency of steamclog, we do not have to import it again

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
Expand Down
12 changes: 8 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.7.10'
ext.timber = '5.0.1'
ext.sentry = '6.4.0'

ext.versions = [
"compileSdk": 33,
"kotlin": "1.8.10",
"timber": "5.0.1",
"sentry": "6.17.0"
]

repositories {
google()
Expand All @@ -11,7 +15,7 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
17 changes: 8 additions & 9 deletions steamclog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ afterEvaluate {
// You can then customize attributes of the publication as shown below.
groupId = 'com.steamclock.steamclog'
artifactId = 'release'
version = 'v2.1'
version = 'v2.2'
}
}
}
}

android {
compileSdkVersion 31 // Android 12 (2021)
buildToolsVersion "31.0.0"
compileSdkVersion versions.compileSdk

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

defaultConfig {
minSdkVersion 21
targetSdkVersion 31 // Android 12 (2021)
versionCode 2
versionName "1.1"
targetSdkVersion versions.compileSdk
versionCode 3
versionName "2.2"
consumerProguardFiles "consumer-rules.pro"
}

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

implementation "com.jakewharton.timber:timber:$timber"
implementation "com.jakewharton.timber:timber:${versions.timber}"
// https://github.com/getsentry/sentry-java/releases
implementation "io.sentry:sentry-android:$sentry"
implementation "io.sentry:sentry-android:${versions.sentry}"
}

0 comments on commit b855ea2

Please sign in to comment.