From 5eefc28b18d7e4ea26d939d00d72c0bdd62f52f2 Mon Sep 17 00:00:00 2001 From: sim Date: Tue, 20 Sep 2022 00:12:40 +0200 Subject: [PATCH] Bump dependencies and target SDK 33 --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 5 +++-- lib/build.gradle | 12 +++++++++--- lib/src/main/AndroidManifest.xml | 3 +-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b9607f1..9bb692a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.5.31" + ext.kotlin_version = "1.7.10" repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.0.3" + classpath "com.android.tools.build:gradle:7.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..3c38b49 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Sep 19 19:39:43 CEST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/lib/build.gradle b/lib/build.gradle index 6dfea8c..f672fa6 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -8,12 +8,12 @@ plugins { android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdk 33 + buildToolsVersion '33.0.0' defaultConfig { minSdkVersion 16 - targetSdkVersion 30 + targetSdk 33 versionCode 1 versionName "1.0.0-beta3" @@ -27,6 +27,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + buildFeatures { + buildConfig = false + } + + namespace "org.unifiedpush.android.foss_embedded_fcm_distributor" } dependencies { diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml index f5a17d4..5f27300 100644 --- a/lib/src/main/AndroidManifest.xml +++ b/lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -21,4 +20,4 @@ - \ No newline at end of file +