Skip to content

Commit

Permalink
Update app version and deps
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomanaia committed Feb 21, 2023
1 parent 18b3df4 commit 1d3eb8e
Show file tree
Hide file tree
Showing 20 changed files with 102 additions and 96 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# New Quiz

[![Version](https://img.shields.io/badge/Version-1.3.2-blueviolet)](https://github.com/joaomanaia/newquiz/releases/tag/1.3.2)
[![Version](https://img.shields.io/badge/Version-1.3.2-blueviolet)](https://github.com/joaomanaia/newquiz/releases/tag/1.4.0)
[![Android CI](https://github.com/joaomanaia/newquiz/actions/workflows/android.yml/badge.svg?branch=main)](https://github.com/joaomanaia/newquiz/actions/workflows/android.yml)
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)

Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
id("com.google.firebase.firebase-perf")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
id("com.google.android.gms.oss-licenses-plugin")
}

Expand Down Expand Up @@ -43,11 +43,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ buildscript {
}

plugins {
id("com.android.application") version "8.1.0-alpha04" apply false
id("com.android.library") version "8.1.0-alpha04" apply false
id("org.jetbrains.kotlin.android") apply false version "1.8.0"
id("com.android.application") version "8.1.0-alpha06" apply false
id("com.android.library") version "8.1.0-alpha06" apply false
id("org.jetbrains.kotlin.android") apply false version "1.8.10"
id("org.jetbrains.kotlin.plugin.serialization") apply false
id("com.google.dagger.hilt.android") apply false
id("com.google.gms.google-services") apply false
id("com.android.dynamic-feature") version "8.1.0-alpha04" apply false
id("com.android.dynamic-feature") version "8.1.0-alpha06" apply false
}

tasks.register("clean", Delete::class) {
Expand Down
10 changes: 8 additions & 2 deletions buildSrc/src/main/java/ProjectConfig.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.gradle.api.JavaVersion

object ProjectConfig {
const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand All @@ -9,7 +11,11 @@ object ProjectConfig {

const val targetSdk = 33

const val versionCode = 7
const val versionCode = 8

const val versionName = "1.4.0"

val javaVersionCompatibility = JavaVersion.VERSION_17

const val versionName = "1.3.2"
const val jvmTargetVersion = "17"
}
8 changes: 4 additions & 4 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
kotlin("kapt")
id("kotlinx-serialization")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -31,11 +31,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
kotlin("kapt")
id("kotlinx-serialization")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.7.21-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -29,11 +29,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
lint {
Expand Down
8 changes: 4 additions & 4 deletions domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -28,11 +28,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
lint {
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

[plugins]

gradle = { id = "gradle", version = "8.1.0-alpha04" }
gradle = { id = "gradle", version = "8.1.0-alpha06" }

org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "1.7.21" }
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "1.8.10" }

org-jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.7.21" }
org-jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.8.10" }

com-google-dagger-hilt-android = { id = "com.google.dagger.hilt.android", version = "2.44.2" }

com-google-gms-google-services = { id = "com.google.gms.google-services", version = "4.3.14" }

org-jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version = "1.7.21" }
org-jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version = "1.8.10" }

com-google-devtools-ksp = { id = "com.google.devtools.ksp", version = "1.7.21-1.0.8" }
com-google-devtools-ksp = { id = "com.google.devtools.ksp", version = "1.8.10-1.0.9" }

[versions]

kotlin = "1.8.0"
## ⬆ = "1.8.10"
kotlin = "1.8.10"
## ⬆ = "1.8.20-Beta"

firebase-appcheck-safetynet = "16.1.1"
oss-licenses-plugin = "0.10.6"
Expand All @@ -37,7 +37,7 @@ truth = "com.google.truth:truth:1.1.3"

kotlin-parcelize-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-parcelize-runtime", version.ref = "kotlin" }

lottie-compose = "com.airbnb.android:lottie-compose:5.2.0"
lottie-compose = "com.airbnb.android:lottie-compose:6.0.0"

io-github-raamcosta-compose-destinations-core = "io.github.raamcosta.compose-destinations:core:1.8.33-beta"

Expand Down
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 @@
#Sat Sep 03 20:12:28 WEST 2022
#Tue Feb 21 15:01:44 WET 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 4 additions & 4 deletions home-presentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -30,11 +30,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions math-quiz/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -30,11 +30,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions maze-quiz/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -30,11 +30,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions model/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("kotlinx-serialization")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -30,11 +30,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions multi-choice-quiz/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("kotlinx-serialization")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -31,11 +31,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions online_services/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
kotlin("kapt")
id("kotlinx-serialization")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}
android {
namespace = "com.infinitepower.newquiz.online_services"
Expand All @@ -30,11 +30,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions settings-presentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.8.10-1.0.9"
}

android {
Expand All @@ -30,11 +30,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
6 changes: 3 additions & 3 deletions translation_dynamic_feature/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = ProjectConfig.javaVersionCompatibility
targetCompatibility = ProjectConfig.javaVersionCompatibility
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = ProjectConfig.jvmTargetVersion
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
buildFeatures {
Expand Down
Loading

0 comments on commit 1d3eb8e

Please sign in to comment.