Skip to content

Commit 89e980f

Browse files
committed
Library updates
1 parent a80a0dd commit 89e980f

9 files changed

Lines changed: 21 additions & 20 deletions

File tree

appupdatewrapper/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ android {
5151
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5252
}
5353
}
54+
namespace 'com.motorro.appupdatewrapper'
5455
}
5556

5657
dependencies {
5758
implementation fileTree(dir: 'libs', include: ['*.jar'])
5859

5960
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
6061

61-
api 'androidx.core:core-ktx:1.7.0'
62-
api 'androidx.lifecycle:lifecycle-common:2.4.0'
63-
api 'com.google.android.play:core:1.10.2'
62+
api 'androidx.core:core-ktx:1.8.0'
63+
api 'androidx.lifecycle:lifecycle-common:2.4.1'
64+
api 'com.google.android.play:core:1.10.3'
6465

6566
implementation 'com.jakewharton.timber:timber:5.0.1'
6667

@@ -70,8 +71,8 @@ dependencies {
7071
testImplementation 'junit:junit:4.13.2'
7172
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
7273
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
73-
testImplementation 'org.robolectric:robolectric:4.7.3'
74-
testImplementation 'androidx.lifecycle:lifecycle-runtime-testing:2.4.0'
74+
testImplementation 'org.robolectric:robolectric:4.8.1'
75+
testImplementation 'androidx.lifecycle:lifecycle-runtime-testing:2.4.1'
7576
}
7677

7778
dokkaJavadoc.configure {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<manifest package="com.motorro.appupdatewrapper"/>
1+
<manifest />

appupdatewrapper/src/main/java/com/motorro/appupdatewrapper/AppUpdateState.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ internal class Done: AppUpdateState(), Tagged {
188188
* Reports non-critical update error.
189189
* Ends-up in [AppUpdateView.updateComplete] calling [AppUpdateView.nonCriticalUpdateError]
190190
*/
191-
internal class Error(@VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
191+
internal class Error(@get:VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
192192
/**
193193
* Handles lifecycle `onResume`
194194
*/
@@ -209,7 +209,7 @@ internal class Error(@VisibleForTesting val error: AppUpdateException) : AppUpda
209209
* Reports critical update error.
210210
* Ends-up in [AppUpdateView.updateFailed]
211211
*/
212-
internal class Failed(@VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
212+
internal class Failed(@get:VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
213213
/**
214214
* Handles lifecycle `onResume`
215215
*/

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply from: 'gradle/maven-publish-config.gradle'
44
apply plugin: 'io.github.gradle-nexus.publish-plugin'
55

66
buildscript {
7-
ext.kotlin_version = '1.6.10'
7+
ext.kotlin_version = '1.7.0'
88
ext.dokka_version = '1.6.0'
99
repositories {
1010
google()
@@ -21,7 +21,7 @@ buildscript {
2121
}
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:7.0.4'
24+
classpath 'com.android.tools.build:gradle:7.2.1'
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2626
classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.1'
2727
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

sample/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ android {
4040
buildFeatures {
4141
viewBinding true
4242
}
43+
namespace 'com.motorro.appupdatewrapper.sample'
4344
}
4445

4546
dependencies {
4647
implementation project(":appupdatewrapper")
4748
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
48-
implementation 'androidx.core:core-ktx:1.7.0'
49-
implementation 'androidx.appcompat:appcompat:1.4.0'
50-
implementation 'com.google.android.material:material:1.4.0'
51-
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
49+
implementation 'androidx.core:core-ktx:1.8.0'
50+
implementation 'androidx.appcompat:appcompat:1.4.2'
51+
implementation 'com.google.android.material:material:1.6.1'
52+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
5253
}

sample/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.motorro.appupdatewrapper.sample">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="false"

testapp/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ android {
2626

2727
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2828
}
29+
namespace 'com.motorro.appupdatewrapper.testapp'
2930
}
3031

3132
dependencies {
3233
implementation project(":appupdatewrapper")
33-
api 'androidx.appcompat:appcompat:1.4.0'
34+
api 'androidx.appcompat:appcompat:1.4.2'
3435
}

testapp/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.motorro.appupdatewrapper.testapp">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

0 commit comments

Comments
 (0)