Skip to content

Commit

Permalink
Merge pull request #36 from hotwired/bump-dependencies
Browse files Browse the repository at this point in the history
Upgrade AGP, SDK version, Kotlin version and dependencies
  • Loading branch information
jayohms authored Feb 28, 2024
2 parents 561ec3f + 545c865 commit 53efb9f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

## Requirements

1. Android SDK 24+ is required as the `minSdkVersion` in your build.gradle.
1. Android SDK 26+ is required as the `minSdkVersion` in your build.gradle.
1. This library is written entirely in [Kotlin](https://kotlinlang.org/), and your app should use Kotlin as well. Compatibility with Java is not provided or supported.
1. This library supports [Turbo Native](https://turbo.hotwired.dev/handbook/native) hybrid apps.
1. Your web app must be running [strada-web](https://github.com/hotwired/strada-web). The `window.Strada` object is automatically exposed on the loaded WebView page, which enables `strada-android` to work.
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = '1.7.20'
ext.kotlinVersion = '1.9.10'

repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
Expand Down
4 changes: 2 additions & 2 deletions docs/INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ See the [latest version](https://search.maven.org/artifact/dev.hotwire/strada) a
**Note:** `strada-android` works seamlessly with [turbo-android](https://github.com/hotwired/turbo-android) and the documentation provides instructions for integrating Strada with your [Turbo Native](https://turbo.hotwired.dev/handbook/native) app. Keep in mind that `turbo-android` is not automatically included as a dependency in `strada-android`, so you'll want to setup your `turbo-android` app first.

## Required `minSdkVersion`
Android SDK 24 (or greater) is required as the `minSdkVersion` in your app module's `build.gradle` file:
Android SDK 26 (or greater) is required as the `minSdkVersion` in your app module's `build.gradle` file:
```groovy
defaultConfig {
minSdkVersion 24
minSdkVersion 26
...
}
```
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Feb 28 14:58:13 EST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
16 changes: 8 additions & 8 deletions strada/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ repositories {
}

android {
compileSdkVersion 33
compileSdk = 34

defaultConfig {
minSdkVersion 24
targetSdkVersion 33
minSdkVersion 26
targetSdkVersion 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -87,16 +87,16 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
implementation 'androidx.lifecycle:lifecycle-common:2.6.1'
implementation 'androidx.lifecycle:lifecycle-common:2.7.0'

testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.5.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'androidx.lifecycle:lifecycle-runtime-testing:2.6.1'
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
testImplementation 'org.robolectric:robolectric:4.9.2'
testImplementation 'androidx.lifecycle:lifecycle-runtime-testing:2.7.0'
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
testImplementation 'org.robolectric:robolectric:4.11.1'
testImplementation 'org.mockito:mockito-core:5.2.0'
testImplementation 'com.nhaarman:mockito-kotlin:1.6.0'
}
Expand Down

0 comments on commit 53efb9f

Please sign in to comment.