From 43b80068ac4aeb0a0ada02bd5999538ca0c85b0c Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 27 Mar 2023 13:17:21 +0100
Subject: [PATCH] Upgrade all the things, target API 33, bump library version.
---
build.gradle | 5 +++--
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ++--
lib/build.gradle | 6 +++---
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index 785ae44..fdda14e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,13 @@
buildscript {
- ext.kotlin_version = '1.6.20'
+ ext.kotlin_version = '1.8.0'
+ ext.dagger_version = '2.45'
repositories {
mavenCentral()
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.4'
+ classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
diff --git a/gradle.properties b/gradle.properties
index 8478b5b..d202c77 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
GROUP=org.briarproject
POM_ARTIFACT_ID=dont-kill-me-lib
-VERSION_NAME=0.2.5
+VERSION_NAME=0.2.6
POM_NAME=Do not kill me library
POM_DESCRIPTION=An Android library helping to keep a foreground service with wake-locks running. No other use-cases considered.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0a02714..9ff0819 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
-distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
\ No newline at end of file
diff --git a/lib/build.gradle b/lib/build.gradle
index f251370..1c1f8c8 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -6,11 +6,11 @@ plugins {
}
android {
- compileSdkVersion 31
+ compileSdkVersion 33
defaultConfig {
minSdk 16
- targetSdk 30
+ targetSdk 33
consumerProguardFiles "consumer-rules.pro"
}
@@ -42,7 +42,7 @@ dependencies {
implementation 'org.briarproject:null-safety:0.1'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'javax.inject:javax.inject:1'
- implementation "com.google.dagger:dagger:2.43.2"
+ implementation "com.google.dagger:dagger:$dagger_version"
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
}
--
GitLab