Skip to content

Commit 7a5d592

Browse files
committed
android gradle update
1 parent 4c4c5f1 commit 7a5d592

File tree

5 files changed

+16
-23
lines changed

5 files changed

+16
-23
lines changed

platform/android/studio/app/build.gradle.kts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
alias(libs.plugins.android.application)
3-
alias(libs.plugins.jetbrains.kotlin.android)
2+
id("com.android.application") version "8.7.3"
3+
id("org.jetbrains.kotlin.android") version "1.9.25"
44
}
55

66
android {
@@ -13,7 +13,7 @@ android {
1313
applicationId = "org.fullstacked.editor"
1414
minSdk = 29
1515
targetSdk = 34
16-
versionCode = 965
16+
versionCode = 966
1717
versionName = "0.11.1"
1818

1919
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -35,22 +35,17 @@ android {
3535
}
3636
}
3737
compileOptions {
38-
sourceCompatibility = JavaVersion.VERSION_1_8
39-
targetCompatibility = JavaVersion.VERSION_1_8
38+
sourceCompatibility = JavaVersion.VERSION_20
39+
targetCompatibility = JavaVersion.VERSION_20
4040
}
4141
kotlinOptions {
42-
jvmTarget = "1.8"
42+
jvmTarget = "20"
4343
}
4444
buildFeatures {
4545
compose = true
4646
}
4747
composeOptions {
48-
kotlinCompilerExtensionVersion = "1.5.1"
49-
}
50-
packaging {
51-
resources {
52-
excludes += "/META-INF/*"
53-
}
48+
kotlinCompilerExtensionVersion = "1.5.15"
5449
}
5550
sourceSets {
5651
getByName("main") {

platform/android/studio/app/src/main/java/org/fullstacked/editor/Instance.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.fullstacked.editor
22

3-
import java.util.Arrays
4-
53
class Instance(val projectId: String, val isEditor: Boolean = false) {
6-
private lateinit var headerRequest: ByteArray
4+
private var headerRequest: ByteArray
75

86
private external fun call(buffer: ByteArray): ByteArray
97

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
alias(libs.plugins.android.application) apply false
4-
alias(libs.plugins.jetbrains.kotlin.android) apply false
3+
id("com.android.application") version "8.7.3" apply false
4+
id("org.jetbrains.kotlin.android") version "1.9.25" apply false
55
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jul 24 22:17:58 EDT 2024
1+
#Thu Apr 03 11:55:39 EDT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

platform/apple/FullStacked.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
379379
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
380380
CODE_SIGN_STYLE = Automatic;
381-
CURRENT_PROJECT_VERSION = 965;
381+
CURRENT_PROJECT_VERSION = 966;
382382
DEVELOPMENT_ASSET_PATHS = "";
383383
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
384384
ENABLE_PREVIEWS = YES;
@@ -420,7 +420,7 @@
420420
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
421421
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
422422
CODE_SIGN_STYLE = Automatic;
423-
CURRENT_PROJECT_VERSION = 965;
423+
CURRENT_PROJECT_VERSION = 966;
424424
DEVELOPMENT_ASSET_PATHS = "";
425425
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
426426
ENABLE_PREVIEWS = YES;
@@ -463,7 +463,7 @@
463463
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
464464
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
465465
CODE_SIGN_STYLE = Automatic;
466-
CURRENT_PROJECT_VERSION = 965;
466+
CURRENT_PROJECT_VERSION = 966;
467467
DEAD_CODE_STRIPPING = YES;
468468
DEVELOPMENT_ASSET_PATHS = "";
469469
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
@@ -514,7 +514,7 @@
514514
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
515515
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
516516
CODE_SIGN_STYLE = Automatic;
517-
CURRENT_PROJECT_VERSION = 965;
517+
CURRENT_PROJECT_VERSION = 966;
518518
DEAD_CODE_STRIPPING = YES;
519519
DEVELOPMENT_ASSET_PATHS = "";
520520
DEVELOPMENT_TEAM = QD7Y9DQ5V4;

0 commit comments

Comments
 (0)