Skip to content

Atualizando algumas dependências #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabrielbmoro merged 5 commits into from
Mar 7, 2026
Merged

Atualizando algumas dependências #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2dfb2e
Update Gradle, Kotlin, and Java versions
gabrielbmoro Mar 6, 2026
b94270b
Remove not necessary file
gabrielbmoro Mar 6, 2026
0a6ab2d
Add kotzilla.json to gitignore
gabrielbmoro Mar 6, 2026
c6bd8ca
Fixing bugs on iOS to use jdk 21
gabrielbmoro Mar 6, 2026
674d19c
Merge branch 'master' into gmoro/update-some-deps
gabrielbmoro Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
.cxx
.kotlin
local.properties
/composeApp/kotzilla.json
5 changes: 5 additions & 0 deletions build-logic/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import org.gradle.api.JavaVersion
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

object Config {
const val appName = "streamplayerapp"
const val applicationId = "com.codandotv.$appName"
val jvmTarget = JvmTarget.JVM_21
val javaVersion = JavaVersion.VERSION_21
const val compileSdkVersion = 35
const val minSdkVersion = 28
const val targetSdkVersion = 35
Expand Down
7 changes: 3 additions & 4 deletions build-logic/src/main/java/com.streamplayer.application.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,24 @@ import extensions.iosTarget
import extensions.setupAndroidDefaultConfig
import extensions.setupCompileOptions
import extensions.setupPackingOptions
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.multiplatform")
id("kotlin-kapt")
id("kotlin-parcelize")
id("com.streamplayer.dokka")
id("com.streamplayer.detekt")
}
val catalog: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")

kotlin {
jvmToolchain(21)

androidTarget {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
jvmTarget.set(Config.jvmTarget)
}
}

Expand Down
5 changes: 3 additions & 2 deletions build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@ plugins {
id("org.jetbrains.kotlin.multiplatform")
id("com.android.library")
id("org.jetbrains.kotlin.plugin.serialization")
id("kotlin-kapt")
id("kotlin-parcelize")
id("com.streamplayer.dokka")
id("com.streamplayer.detekt")
}

kotlin {
jvmToolchain(21)

androidTarget {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
jvmTarget.set(Config.jvmTarget)
freeCompilerArgs.add("-Xstring-concat=inline")
}
}
Expand Down
7 changes: 2 additions & 5 deletions build-logic/src/main/java/extensions/CommonExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
@file:Suppress("UnstableApiUsage")

package extensions

import Config
import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalog
import org.gradle.api.artifacts.VersionCatalogsExtension
Expand Down Expand Up @@ -38,8 +35,8 @@ internal fun CommonExtension<*, *, *, *, *, *>.setupAndroidDefaultConfig() {

internal fun CommonExtension<*, *, *, *, *, *>.setupCompileOptions() {
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = Config.javaVersion
targetCompatibility = Config.javaVersion
}
}

Expand Down
1 change: 0 additions & 1 deletion build/kotlin/commonizedNativeDistributionLocation.txt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
kotlin = "2.1.10"
android_gradle_plugin = "8.7.2"
kotlin = "2.3.10"
android_gradle_plugin = "8.7.3"
koin = "4.0.1"
ksp = "2.1.10-1.0.29"
ksp = "2.3.5"

dokka = "1.9.10"
detekt = "1.23.6"
Expand Down
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#Wed Feb 19 11:41:18 BRT 2025
#Thu Mar 05 21:58:53 BRT 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 2 additions & 4 deletions iosApp/iosApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
3FD330BB2DD2CFC300633ECC /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
5BA9B50A2DA8871200EF12ED /* iosApp.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = file; path = iosApp.xctestplan; sourceTree = SOURCE_ROOT; };
5BA9B50C2DA887EE00EF12ED /* iosApp.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = iosApp.xctestplan; path = iosAppTests/iosApp.xctestplan; sourceTree = SOURCE_ROOT; };
5BA9B5112DA889A300EF12ED /* iosAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5BA9B5132DA889A300EF12ED /* iosAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -162,7 +161,6 @@
3FD330BB2DD2CFC300633ECC /* GoogleService-Info.plist */,
5BAD97862D7CCDDA00D93987 /* Lottie.swift */,
5BA9B50C2DA887EE00EF12ED /* iosApp.xctestplan */,
5BA9B50A2DA8871200EF12ED /* iosApp.xctestplan */,
058557BA273AAA24004C7B11 /* Assets.xcassets */,
7555FF82242A565900829871 /* ContentView.swift */,
7555FF8C242A565B00829871 /* Info.plist */,
Expand Down Expand Up @@ -371,7 +369,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = ABCDE12345;
DEVELOPMENT_TEAM = P8ZZXHC5BB;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -541,7 +539,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = 4U9U2835SF;
DEVELOPMENT_TEAM = P8ZZXHC5BB;
ENABLE_PREVIEWS = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down