Skip to content

Commit

Permalink
Update dependencies to match proper Kotlin version
Browse files Browse the repository at this point in the history
  • Loading branch information
rafalniski committed Aug 22, 2022
1 parent afc571c commit b986e3f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
18 changes: 9 additions & 9 deletions android_sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
plugins {
id("com.android.application")
id "org.jetbrains.kotlin.android" version "1.6.0-RC"
id("org.jetbrains.kotlin.android.extensions") version "1.5.30"
id "org.jetbrains.kotlin.android" version "1.7.10"
id("org.jetbrains.kotlin.android.extensions") version "1.7.10"
}

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

android {
compileSdkVersion 29
compileSdkVersion 32
buildToolsVersion "30.0.3"


defaultConfig {
applicationId "com.contentful.rich.android.sample"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 32
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -49,13 +49,13 @@ dependencies {
implementation project(path: ':android')
implementation project(path: ':core')

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3"
implementation 'androidx.appcompat:appcompat:1.5.0'

implementation "com.contentful.java:java-sdk:${project.contentful_version}"
implementation 'com.google.code.findbugs:jsr305:3.0.2'

implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}
3 changes: 1 addition & 2 deletions android_sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
>
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar"
>
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

Expand Down
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-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ pluginManagement {
resolutionStrategy {
eachPlugin {
if (requested.id.id.startsWith("com.android")) {
useModule("com.android.tools.build:gradle:7.0.2")
useModule("com.android.tools.build:gradle:7.2.0")
}
if (requested.id.id.startsWith("org.jetbrains.kotlin")) {
useVersion("1.5.31")
useVersion("1.7.10")
}
}
}
Expand Down

0 comments on commit b986e3f

Please sign in to comment.