diff --git a/build.gradle b/build.gradle index 4607df8..3249230 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.40' + ext.kotlin_version = Versions.KOTLIN repositories { google() diff --git a/buildSrc/src/main/java/com/yelp/gradle/varanus/GlobalDependencies.kt b/buildSrc/src/main/java/com/yelp/gradle/varanus/GlobalDependencies.kt index 59f948e..3808129 100644 --- a/buildSrc/src/main/java/com/yelp/gradle/varanus/GlobalDependencies.kt +++ b/buildSrc/src/main/java/com/yelp/gradle/varanus/GlobalDependencies.kt @@ -2,31 +2,31 @@ object Versions { // Android - const val COMPILE_SDK = 28 + const val COMPILE_SDK = 31 const val MIN_SDK = 21 - const val TARGET_SDK = 28 + const val TARGET_SDK = 31 // Java const val SOURCE_COMPATIBILITY = 1.8 const val TARGET_COMPATIBILITY = 1.8 - const val ANDROID_BUILD_TOOLS = "3.3.2" // If you update this you should update LINT as well + const val ANDROID_BUILD_TOOLS = "8.1.1" // If you update this you should update LINT as well const val ANDROID_CHECK = "1.2.5" const val APPCOMPAT = "1.0.0" const val CACHE2K = "1.2.2.Final" - const val COROUTINES = "1.1.0" + const val COROUTINES = "1.7.3" const val CONSTRAINTLAYOUT = "1.1.3" const val DESIGN = "1.0.0" - const val DETEKT = "1.0.0-RC12" + const val DETEKT = "1.23.3" const val GOOGLE_PLAY_SERVICES_PLUGIN = "4.0.1" // If you want to update the Gradle version, change this number and then run `./gradlew wrapper`. - const val GRADLE = "5.4.1" - const val KOTLIN = "1.3.72" + const val GRADLE = "8.4.0" + const val KOTLIN = "1.9.10" const val MAVEN_PUBLISH = "3.6.2" const val MAVEN_SETTINGS = "0.5" const val OK_HTTP = "4.5.0" const val OKIO = "2.2.2" - const val REALM = "5.7.0" + const val REALM = "10.15.1" const val ESPRESSO = "3.1.0" const val JUNIT = "4.12" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee69dd6..da1db5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/publishing.gradle b/publishing.gradle index 816dd75..7794dbe 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -7,7 +7,6 @@ group Publishing.GROUP version Publishing.VERSION task sourcesJar(type: Jar) { - classifier = 'sources' from android.sourceSets.main.java.srcDirs } diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle index 24908b7..d3ff68c 100644 --- a/sampleapp/build.gradle +++ b/sampleapp/build.gradle @@ -5,12 +5,12 @@ apply plugin: 'realm-android' apply from: '../module.gradle' android { - compileSdkVersion 28 - + namespace "com.yelp.varanus.sampleapp" defaultConfig { applicationId "com.yelp.varanussampleapp" - minSdkVersion 28 - targetSdkVersion 28 + minSdkVersion Versions.MIN_SDK + targetSdkVersion Versions.TARGET_SDK + compileSdkVersion Versions.COMPILE_SDK versionCode 1 versionName "1.0" diff --git a/sampleapp/src/main/AndroidManifest.xml b/sampleapp/src/main/AndroidManifest.xml index e0dcbe6..b88ddcc 100644 --- a/sampleapp/src/main/AndroidManifest.xml +++ b/sampleapp/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/sampleapp/src/main/java/com/yelp/varanussampleapp/MonitorLizardActivity.kt b/sampleapp/src/main/java/com/yelp/varanussampleapp/MonitorLizardActivity.kt index 068365b..7b21cd5 100644 --- a/sampleapp/src/main/java/com/yelp/varanussampleapp/MonitorLizardActivity.kt +++ b/sampleapp/src/main/java/com/yelp/varanussampleapp/MonitorLizardActivity.kt @@ -10,10 +10,10 @@ import android.widget.TextView import com.yelp.android.varanus.shutoff.NetworkShutoffManager import com.yelp.android.varanus.util.CoroutineScopeAndJob import com.yelp.android.varanus.util.JobBasedScope +import com.yelp.varanus.sampleapp.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import okhttp3.MediaType import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.Request diff --git a/varanus/build.gradle b/varanus/build.gradle index e075e4b..069fb70 100644 --- a/varanus/build.gradle +++ b/varanus/build.gradle @@ -23,9 +23,7 @@ ext.projectDescription = 'A client-side Android library to monitor and limit net apply plugin: "com.android.library" apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'com.noveogroup.android.check' -apply plugin: 'findbugs' apply from: '../module.gradle' apply from: '../publishing.gradle' @@ -43,7 +41,7 @@ dependencies { android { compileSdkVersion Versions.COMPILE_SDK - + namespace "com.yelp.android.varanus" defaultConfig { minSdkVersion Versions.MIN_SDK targetSdkVersion Versions.TARGET_SDK diff --git a/varanus/src/main/AndroidManifest.xml b/varanus/src/main/AndroidManifest.xml index f10e70c..cc947c5 100644 --- a/varanus/src/main/AndroidManifest.xml +++ b/varanus/src/main/AndroidManifest.xml @@ -1 +1 @@ - +