Skip to content

Commit

Permalink
Library updates
Browse files Browse the repository at this point in the history
  • Loading branch information
motorro committed Jun 11, 2022
1 parent a80a0dd commit 89e980f
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
11 changes: 6 additions & 5 deletions appupdatewrapper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
namespace 'com.motorro.appupdatewrapper'
}

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

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

api 'androidx.core:core-ktx:1.7.0'
api 'androidx.lifecycle:lifecycle-common:2.4.0'
api 'com.google.android.play:core:1.10.2'
api 'androidx.core:core-ktx:1.8.0'
api 'androidx.lifecycle:lifecycle-common:2.4.1'
api 'com.google.android.play:core:1.10.3'

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

Expand All @@ -70,8 +71,8 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
testImplementation 'org.robolectric:robolectric:4.7.3'
testImplementation 'androidx.lifecycle:lifecycle-runtime-testing:2.4.0'
testImplementation 'org.robolectric:robolectric:4.8.1'
testImplementation 'androidx.lifecycle:lifecycle-runtime-testing:2.4.1'
}

dokkaJavadoc.configure {
Expand Down
2 changes: 1 addition & 1 deletion appupdatewrapper/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="com.motorro.appupdatewrapper"/>
<manifest />
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ internal class Done: AppUpdateState(), Tagged {
* Reports non-critical update error.
* Ends-up in [AppUpdateView.updateComplete] calling [AppUpdateView.nonCriticalUpdateError]
*/
internal class Error(@VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
internal class Error(@get:VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
/**
* Handles lifecycle `onResume`
*/
Expand All @@ -209,7 +209,7 @@ internal class Error(@VisibleForTesting val error: AppUpdateException) : AppUpda
* Reports critical update error.
* Ends-up in [AppUpdateView.updateFailed]
*/
internal class Failed(@VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
internal class Failed(@get:VisibleForTesting val error: AppUpdateException) : AppUpdateState() {
/**
* Handles lifecycle `onResume`
*/
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply from: 'gradle/maven-publish-config.gradle'
apply plugin: 'io.github.gradle-nexus.publish-plugin'

buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.7.0'
ext.dokka_version = '1.6.0'
repositories {
google()
Expand All @@ -21,7 +21,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.1'
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 5 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ android {
buildFeatures {
viewBinding true
}
namespace 'com.motorro.appupdatewrapper.sample'
}

dependencies {
implementation project(":appupdatewrapper")
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}
3 changes: 1 addition & 2 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.motorro.appupdatewrapper.sample">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="false"
Expand Down
3 changes: 2 additions & 1 deletion testapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ android {

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
namespace 'com.motorro.appupdatewrapper.testapp'
}

dependencies {
implementation project(":appupdatewrapper")
api 'androidx.appcompat:appcompat:1.4.0'
api 'androidx.appcompat:appcompat:1.4.2'
}
3 changes: 1 addition & 2 deletions testapp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.motorro.appupdatewrapper.testapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down

0 comments on commit 89e980f

Please sign in to comment.