Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
xcodebuild -project swift_sample.xcodeproj \
-scheme swift_sample \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=Any iOS Simulator Device' \
-destination 'platform=iOS Simulator,name=iPhone 17' \
clean build \
CODE_SIGN_IDENTITY="" \
CODE_SIGNING_REQUIRED=NO \
Expand Down
6 changes: 6 additions & 0 deletions Kotlin_sample/.idea/AndroidProjectSystem.xml

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

2 changes: 2 additions & 0 deletions Kotlin_sample/.idea/misc.xml

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

3 changes: 3 additions & 0 deletions Kotlin_sample/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
10 changes: 10 additions & 0 deletions Kotlin_sample/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,13 @@ dependencies {
implementation (libs.okhttp)
implementation(libs.kotlinx.serialization.json)
}

configurations.all {
resolutionStrategy {
force("io.netty:netty-codec-http2:4.1.129.Final")
force("io.netty:netty-codec-http:4.1.129.Final")
force("commons-io:commons-io:2.21.0")
force("com.google.protobuf:protobuf-java:4.33.1")
force("com.google.protobuf:protobuf-kotlin:4.33.1")
}
}
4 changes: 2 additions & 2 deletions Kotlin_sample/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "8.8.0"
agp = "8.13.2"
kotlin = "2.1.0"
coreKtx = "1.15.0"
junit = "4.13.2"
Expand All @@ -12,7 +12,7 @@ activity = "1.9.3"
constraintlayout = "2.2.0"
okhttp = "4.12.0"
retrofit = "2.11.0"
ktor = "3.0.3"
ktor = "3.3.3"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand Down
2 changes: 1 addition & 1 deletion Kotlin_sample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Dec 03 10:49:32 NZDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading