Skip to content

Commit

Permalink
Library updates
Browse files Browse the repository at this point in the history
  • Loading branch information
motorro committed Nov 30, 2021
1 parent a551821 commit 6f42104
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
6 changes: 3 additions & 3 deletions appupdatewrapper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ dependencies {

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

api 'androidx.core:core-ktx:1.6.0'
kapt 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
api 'androidx.core:core-ktx:1.7.0'
kapt 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
api 'com.google.android.play:core:1.10.2'

implementation 'com.jakewharton.timber:timber:5.0.1'
Expand All @@ -73,7 +73,7 @@ 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.5.1'
testImplementation 'org.robolectric:robolectric:4.7.2'
}

dokkaJavadoc.configure {
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ apply from: 'gradle/maven-publish-config.gradle'
apply plugin: 'io.github.gradle-nexus.publish-plugin'

buildscript {
ext.kotlin_version = '1.5.31'
ext.dokka_version = '1.4.32'
ext.kotlin_version = '1.6.0'
ext.dokka_version = '1.6.0'
repositories {
google()
mavenCentral()
Expand All @@ -21,7 +21,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
Expand All @@ -32,10 +32,10 @@ buildscript {

ext {
// Android
androidBuildToolsVersion = '30.0.2'
androidBuildToolsVersion = '31.0.0'
androidMinSdkVersion = 21
androidTargetSdkVersion = 29
androidCompileSdkVersion = 29
androidTargetSdkVersion = 31
androidCompileSdkVersion = 31
versionName = project.version
versionCode = buildVersionCode()

Expand Down
12 changes: 6 additions & 6 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ plugins {
}

android {
compileSdkVersion 30
compileSdkVersion androidCompileSdkVersion

defaultConfig {
applicationId "com.motorro.appupdatewrapper.sample"
minSdkVersion 28
targetSdkVersion 30
minSdkVersion androidMinSdkVersion
targetSdkVersion androidTargetSdkVersion
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -45,8 +45,8 @@ android {
dependencies {
implementation project(":appupdatewrapper")
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
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.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
}
5 changes: 2 additions & 3 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
package="com.motorro.appupdatewrapper.sample">

<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.AppUpdateWrapper">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
2 changes: 1 addition & 1 deletion testapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ android {

dependencies {
implementation project(":appupdatewrapper")
api 'androidx.appcompat:appcompat:1.3.1'
api 'androidx.appcompat:appcompat:1.4.0'
}

0 comments on commit 6f42104

Please sign in to comment.