Skip to content

Commit

Permalink
Update sample app to Blueprint 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Patryk Michalik committed Jul 26, 2022
1 parent 9806f77 commit 496c48f
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 25 deletions.
27 changes: 14 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.devtools.ksp'

android {
lintOptions {
lint {
abortOnError false
checkReleaseBuilds true
disable 'MissingTranslation', 'GoogleAppIndexingWarning'
Expand All @@ -46,13 +46,10 @@ android {
proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'

javaCompileOptions {
annotationProcessorOptions {
arguments = [
"room.schemaLocation" : "$projectDir/schemas".toString(),
"room.incremental" : "true",
"room.expandProjection": "true"]
}
ksp {
arg("room.schemaLocation", "$projectDir/schemas")
arg("room.incremental", "true")
arg("room.expandProjection", "true")
}
}

Expand All @@ -75,10 +72,14 @@ android {
}

packagingOptions {
pickFirst 'META-INF/core_debug.kotlin_module'
pickFirst 'META-INF/core_release.kotlin_module'
pickFirst 'META-INF/library_debug.kotlin_module'
pickFirst 'META-INF/library_release.kotlin_module'
resources {
pickFirsts += [
'META-INF/core_debug.kotlin_module',
'META-INF/core_release.kotlin_module',
'META-INF/library_debug.kotlin_module',
'META-INF/library_release.kotlin_module'
]
}
}

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ buildscript {
dependencies {
classpath Plugins.android
classpath Plugins.kotlin
classpath Plugins.ksp
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/java/MyApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

object MyApp {
const val appId = "dev.jahir.blueprint.app"
const val version = 228
const val versionName = "2.2.8"
const val version = 230
const val versionName = "2.3.0"
}
3 changes: 3 additions & 0 deletions buildSrc/src/main/java/Plugins.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ object Plugins {
// OneSignal
const val oneSignal =
"gradle.plugin.com.onesignal:onesignal-gradle-plugin:${Versions.oneSignalPlugin}"
// KSP
const val ksp =
"com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.ksp}"
}
13 changes: 7 additions & 6 deletions buildSrc/src/main/java/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@

object Versions {
// Plugins
const val gradle = "7.1.1"
const val kotlin = "1.5.31"
const val gradle = "7.2.1"
const val kotlin = "1.7.0"
const val ksp = "$kotlin-1.0.6"

// OneSignal
const val oneSignalPlugin = "0.14.0"
const val oneSignal = "4.6.7"
const val oneSignal = "4.8.1"

// App
const val minSdk = 21
const val targetSdk = 31
const val buildTools = "30.0.3"
const val targetSdk = 32
const val buildTools = "32.0.0"

// Blueprint
const val blueprint = "2.2.8"
const val blueprint = "2.3.0"
}
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kapt.incremental.apt=true
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Mar 17 11:14:49 COT 2020
#Sun Jul 24 22:47:34 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 496c48f

Please sign in to comment.