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
46 changes: 46 additions & 0 deletions .github/workflows/check-toolchain.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Check toolchain

# Fails a pull request that drifts off the standard plugin toolchain
# (ADFA-4907). The standard itself lives in scripts/check-toolchain.sh — it is
# deliberately not restated here, so there is only one copy of the numbers.
#
# This is the only workflow here that runs automatically on pull requests.
# "Build plugin artifacts" and "Update libs from CodeOnTheGo" are both
# workflow_dispatch-only, which is why toolchain drift previously reached
# main with no CI signal at all.
#
# It is pure text inspection — no JDK, no Gradle, no network — so it costs a
# few seconds and is safe to make a required check.

on:
pull_request:
push:
branches: [main]
workflow_dispatch:

permissions:
contents: read

jobs:
check-toolchain:
name: Toolchain versions
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Check toolchain versions
run: ./scripts/check-toolchain.sh

- name: Report declared versions
# Runs even when the check above fails, so the run summary shows what
# every module actually declares next to the failure list.
if: always()
run: |
{
echo '### Declared toolchain versions'
echo
echo '```'
./scripts/check-toolchain.sh --list
echo '```'
} >> "$GITHUB_STEP_SUMMARY"
4 changes: 2 additions & 2 deletions Beepy/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ pluginBuilder {

android {
namespace = "com.example.beepy"
compileSdk = 33
compileSdk = 36

defaultConfig {
applicationId = "com.example.beepy"
minSdk = 28
targetSdk = 33
targetSdk = 36
versionCode = 1
versionName = "1.0.0"
}
Expand Down
10 changes: 5 additions & 5 deletions ai-assistant/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ pluginBuilder {

android {
namespace = "com.itsaky.androidide.plugins.aiassistant"
compileSdk = 34
compileSdk = 36

defaultConfig {
applicationId = "com.itsaky.androidide.plugins.aiassistant"
minSdk = 33
targetSdk = 34
targetSdk = 36
versionCode = 2
versionName = "1.1.0"
}
Expand Down Expand Up @@ -71,7 +71,7 @@ dependencies {
// resource attributes and resolve xmlns declarations. This is standard across all CoGo plugins
// with XML layouts (random-xkcd, sketch-to-ui-plugin, Beepy). See investigation in Task 4.
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.fragment:fragment-ktx:1.6.2")
implementation("androidx.fragment:fragment-ktx:1.8.8")
implementation("com.google.android.material:material:1.10.0")
implementation("androidx.recyclerview:recyclerview:1.3.2")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
Expand All @@ -85,7 +85,7 @@ dependencies {
testImplementation(files("../libs/plugin-api.jar"))
testImplementation("junit:junit:4.13.2")
testImplementation("io.mockk:mockk:1.13.8")
testImplementation("org.json:json:20231013")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
testImplementation("org.json:json:20240303")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")
testImplementation("androidx.arch.core:core-testing:2.2.0")
}
2 changes: 1 addition & 1 deletion ai-assistant/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion ai-assistant/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
dependencies {
classpath(files("../libs/plugin-api.jar"))
classpath(files("../libs/gradle-plugin.jar"))
classpath("com.android.tools.build:gradle:8.13.2")
classpath("com.android.tools.build:gradle:8.11.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
}
}
Expand Down
6 changes: 3 additions & 3 deletions ai-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ pluginBuilder {

android {
namespace = "com.itsaky.androidide.plugins.aicore"
compileSdk = 34
compileSdk = 36

defaultConfig {
applicationId = "com.itsaky.androidide.plugins.aicore"
minSdk = 33
targetSdk = 34
targetSdk = 36
versionCode = 2
versionName = "1.1.0"
}
Expand Down Expand Up @@ -63,7 +63,7 @@ dependencies {

implementation("androidx.appcompat:appcompat:1.6.1")
implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")

testImplementation(files("../libs/plugin-api.jar"))
testImplementation("junit:junit:4.13.2")
Expand Down
Loading
Loading