wbrawner/Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Version Bumps - AGP 7.1.2, Kotlin 1.6.10 and related updates (#414)

Browse source 
* Latest is 0.8.0, but 0.4.0 works.  Starts to break at 0.5.0.

* Kotlin Atomic Plugin working with 0.14.4

* Atomic Kotlin Plugin working with 0.15.0

* Atomic Kotlin Plugin working with 0.15.1

* Upgrade Gradle Wrapper to 7.4.1

* AGP 4.1.0 -> 4.2.0

* AGP 4.2.0 -> 7.0.2

* AGP 7.0.2 -> 7.1.2

* Kotlin 1.6.10 and Spotless Plugin 6.3.0 Upgrade

* WARNING:The specified Android SDK Build Tools version (29.0.3) is ignored, as it is below the minimum supported version (30.0.3) for Android Gradle Plugin 7.1.2.

* Using --rerun-tasks instead of clean.

* KT Lint formatting update.

Co-authored-by: Sam Edwards <samedwards@dropbox.com>
This commit is contained in:
Sam Edwards 2022-03-17 14:03:15 -04:00 committed by GitHub
parent 009cf8cfd7
commit 83205da5ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/.ci_test_and_publish.yml vendored
View file

@ -65,7 +65,7 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
script: ./gradlew clean cleanBuildCache check --stacktrace
script: ./gradlew check --rerun-tasks --stacktrace
env:
API_LEVEL: ${{ matrix.api-level }}
- name: Upload code coverage

2
build.gradle
View file

@ -51,7 +51,7 @@ allprojects {
}
subprojects {
apply plugin: 'com.diffplug.gradle.spotless'
apply plugin: 'com.diffplug.spotless'
spotless {
kotlin {
target 'src/**/*.kt'

12
buildsystem/dependencies.gradle
View file

@ -2,18 +2,18 @@ ext.versions = [
minSdk : 16,
targetSdk : 29,
compileSdk : 31,
buildTools : '29.0.3',
kotlin : '1.5.31',
buildTools : '30.0.3',
kotlin : '1.6.10',
ktlint : '0.39.0',
// Plugins
androidGradlePlugin : '4.1.0',
androidGradlePlugin : '7.1.2',
dokkaGradlePlugin : '1.6.0',
ktlintGradle : '10.2.1',
spotlessGradlePlugin : '3.26.1',
spotlessGradlePlugin : '6.3.0',
jacocoGradlePlugin : '0.8.7',
binaryCompatibilityValidator: '0.2.3',
atomicFuPlugin : '0.14.2',
binaryCompatibilityValidator: '0.4.0',
atomicFuPlugin : '0.15.1',
mavenPublishPlugin : "0.18.0",
cache : '3.1.1',

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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-6.9.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip

2
store/src/test/java/com/dropbox/android/external/store3/DontCacheErrorsTest.kt vendored
View file

@ -2,6 +2,7 @@ package com.dropbox.android.external.store3
import com.dropbox.android.external.store4.get
import com.dropbox.android.external.store4.Fetcher
import kotlin.time.ExperimentalTime
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
@ -22,6 +23,7 @@ class DontCacheErrorsTest(
private var shouldThrow: Boolean = false
// TODO move to test coroutine scope
@OptIn(ExperimentalTime::class)
private val store = TestStoreBuilder.from<Pair<String, String>, Int>(
testScope,
fetcher = Fetcher.of {

3
store/src/test/java/com/dropbox/android/external/store3/NoNetworkTest.kt vendored
View file

@ -4,6 +4,7 @@ import com.dropbox.android.external.store4.Fetcher
import com.dropbox.android.external.store4.Store
import com.dropbox.android.external.store4.get
import com.google.common.truth.Truth.assertThat
import kotlin.time.ExperimentalTime
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.test.TestCoroutineScope
@ -20,6 +21,8 @@ class NoNetworkTest(
storeType: TestStoreType
) {
private val testScope = TestCoroutineScope()
@OptIn(ExperimentalTime::class)
private val store: Store<Pair<String, String>, out Any> = TestStoreBuilder.from<Pair<String, String>, Any>(
testScope,
fetcher = Fetcher.of {

3
store/src/test/java/com/dropbox/android/external/store3/SequentialTest.kt vendored
View file

@ -3,6 +3,7 @@ package com.dropbox.android.external.store3
import com.dropbox.android.external.store4.Fetcher
import com.dropbox.android.external.store4.get
import com.google.common.truth.Truth.assertThat
import kotlin.time.ExperimentalTime
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.async
@ -21,6 +22,8 @@ class SequentialTest(
private val testScope = TestCoroutineScope()
var networkCalls = 0
@OptIn(ExperimentalTime::class)
private val store = TestStoreBuilder.from<Pair<String, String>, Int>(
scope = testScope,
cached = true,

2
store/src/test/java/com/dropbox/android/external/store3/StreamOneKeyTest.kt vendored
View file

@ -8,6 +8,7 @@ import com.dropbox.android.external.store4.testutil.FakeFetcher
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.whenever
import kotlin.time.ExperimentalTime
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.flow.stateIn
@ -38,6 +39,7 @@ class StreamOneKeyTest(
barCode2 to TEST_ITEM
)
@OptIn(ExperimentalTime::class)
private val store = TestStoreBuilder.from(
scope = testScope,
fetcher = fetcher,