Update to Blueprint 2.3.6

jahirfiquitiva · Jul 17, 2023 · 9ba24c3 · 9ba24c3
1 parent d743342
commit 9ba24c3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 
 on:
   pull_request:
-    branches:    
+    branches:
       - sample
       - master
   push:
@@ -16,19 +16,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
       - name: Delete some caches
         run: rm -f ~/.gradle/caches/modules-2/modules-2.lock; rm -fr ~/.gradle/caches/*/plugin-resolution/
 
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.android/build-cache

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.google.devtools.ksp'
 
@@ -13,6 +13,7 @@ android {
     compileSdkVersion Versions.targetSdk
     buildToolsVersion Versions.buildTools
 
+    namespace MyApp.appId
     defaultConfig {
         buildConfigField("String", "ONESIGNAL_APP_ID", "\"$OneSignal.appId\"")
         manifestPlaceholders = [
@@ -66,12 +67,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
+    }
+
+    buildFeatures {
+        buildConfig = true
     }
 }
 

diff --git a/buildSrc/src/main/java/MyApp.kt b/buildSrc/src/main/java/MyApp.kt
@@ -2,6 +2,6 @@
 
 object MyApp {
     const val appId = "dev.jahir.blueprint.app"
-    const val version = 235
-    const val versionName = "2.3.5"
+    const val version = 236
+    const val versionName = "2.3.6"
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -2,8 +2,8 @@
 
 object Versions {
     // Plugins
-    const val gradle = "7.4.2"
-    const val kotlin = "1.8.21"
+    const val gradle = "8.0.1"
+    const val kotlin = "1.9.0"
     const val ksp = "$kotlin-1.0.11"
 
     // OneSignal
@@ -15,5 +15,5 @@ object Versions {
     const val buildTools = "33.0.2"
 
     // Blueprint
-    const val blueprint = "2.3.5"
+    const val blueprint = "2.3.6"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jul 24 22:47:34 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME