Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
20fb138
wip
acharneski Apr 27, 2025
fe90854
wip
acharneski Apr 27, 2025
4c6d704
wip
acharneski Apr 27, 2025
4ff76c7
wip
acharneski Apr 27, 2025
e79a978
WIN PKG
acharneski Apr 28, 2025
5ba6caa
In the gutters of old Central Park, Lived a squirrel who was vicious …
acharneski Apr 29, 2025
185bd2c
fix
acharneski Apr 30, 2025
1c3226c
rUNcODEtASK
acharneski Apr 30, 2025
f60533b
simplify build
acharneski May 1, 2025
8a1a2db
fixes
acharneski May 1, 2025
4d1c3bb
build
acharneski May 1, 2025
e0484b7
Update AddApplyFileDiffLinks.kt
acharneski May 1, 2025
e9af23f
fix
acharneski May 1, 2025
e4ab98e
simplify mac package
acharneski May 1, 2025
2c630bc
Merge branch '2.0.1' of https://github.com/SimiaCryptus/Cognotik into…
acharneski May 1, 2025
a94c2f0
Update gradle-daemon-jvm.properties
acharneski May 1, 2025
24d28d0
Merge branch '2.0.1' of https://github.com/SimiaCryptus/Cognotik into…
acharneski May 1, 2025
8a9a588
wip
acharneski May 1, 2025
7d45d5f
wip
acharneski May 2, 2025
1cb5861
autoupdate
acharneski May 2, 2025
fa3af9d
wip
acharneski May 2, 2025
bbe4f68
wip
acharneski May 2, 2025
82a9c9a
wip
acharneski May 2, 2025
6cc0e97
wip
acharneski May 2, 2025
2dfb512
Merge branch 'main' into 2.0.1
acharneski May 2, 2025
c9526d1
Update PlanConfigDialog.kt
acharneski May 2, 2025
d939e9c
Update build.yml
acharneski May 2, 2025
51f9a73
Update UpdateManager.kt
acharneski May 2, 2025
b2bf9ec
wip
acharneski May 2, 2025
0b01a6b
wip
acharneski May 2, 2025
aa5bd66
mac
acharneski May 3, 2025
740fa05
codingagent improvements
acharneski May 3, 2025
e2d09b7
Update gradle.properties
acharneski May 3, 2025
5698cf2
fix
acharneski May 3, 2025
47aa344
code auto-run
acharneski May 3, 2025
ff9ce91
Update build.gradle.kts
acharneski May 3, 2025
e877a67
fix
acharneski May 3, 2025
af72f32
updates
acharneski May 3, 2025
1d71bf3
Update SeleniumSessionTask.kt
acharneski May 3, 2025
7934e7f
misc
acharneski May 3, 2025
8d8e3af
fixes
acharneski May 3, 2025
78babf7
Update InterpreterTestBase.scala
acharneski May 3, 2025
1f76622
Update build.gradle.kts
acharneski May 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 0 additions & 37 deletions .github/workflows/dependabot.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/publish.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,3 @@ jobs:
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
PRIVATE_KEY_PASSWORD: ${{ secrets.PRIVATE_KEY_PASSWORD }}
run: ../gradlew build publishPlugin -x test

- name: Upload Release Asset
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release view ${{ github.event.release.tag_name }} || gh release create ${{ github.event.release.tag_name }} --title "Release ${{ github.event.release.tag_name }}" --draft
cd ${{ github.workspace }}/intellij/build/distributions
for file in *; do
gh release upload ${{ github.event.release.tag_name }} "$file"
done
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ metadata.script
.intellijPlatform/
node_modules/
metadata.*
.DS_Store
14 changes: 3 additions & 11 deletions antlr/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
plugins {
java
`java-library`
antlr
}

fun properties(key: String) = project.findProperty(key).toString()
group = properties("libraryGroup")
version = properties("libraryVersion")
group = providers.gradleProperty("libraryGroup").get()
version = providers.gradleProperty("libraryVersion").get()

repositories {
mavenCentral()
}

dependencies {
implementation(libs.antlr.runtime)
antlr("org.antlr:antlr4:${libs.versions.antlr.get()}")
antlr(libs.antlr.tool)
}

tasks {
Expand All @@ -33,11 +30,6 @@ tasks {
}
}
}
withType<JavaCompile> {
options.release.set(17)


}

register("cleanGeneratedSources") {
group = "build"
Expand Down
142 changes: 74 additions & 68 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,64 @@ fun properties(key: String) = project.findProperty(key).toString()
group = properties("libraryGroup")
version = properties("libraryVersion")

subprojects {
apply(plugin = "java")
apply(plugin = "kotlin")
repositories {
mavenCentral()
}
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
options.compilerArgs.add("-parameters")
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
freeCompilerArgs = listOf("-Xjsr305=strict")
javaParameters = true
}
}
tasks.register("analyzeDependencies") {
description = "Analyzes project dependencies for potential issues"
doLast {
val implementation = configurations.findByName("implementation")
val api = configurations.findByName("api")
if (implementation != null && api != null) {
val implementationDeps = implementation.dependencies.map { "${it.group}:${it.name}" }.toSet()
val apiDeps = api.dependencies.map { "${it.group}:${it.name}" }.toSet()
val duplicates = implementationDeps.intersect(apiDeps)
if (duplicates.isNotEmpty()) {
logger.warn("Found dependencies declared in both api and implementation: $duplicates")
}
}
}
}
}

allprojects {
apply(plugin = "java")
java {
toolchain { languageVersion.set(JavaLanguageVersion.of(17)) }
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
}
configurations.all {
// Apply resolution strategy to all configurations in all projects
resolutionStrategy {
force(
"org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.get()}",
"org.jetbrains.kotlin:kotlin-reflect:${libs.versions.kotlin.get()}",
"org.slf4j:slf4j-api:${libs.versions.slf4j.get()}"
"org.jetbrains.kotlin:kotlin-stdlib:${rootProject.libs.versions.kotlin.get()}",
"org.jetbrains.kotlin:kotlin-reflect:${rootProject.libs.versions.kotlin.get()}",
"org.slf4j:slf4j-api:${rootProject.libs.versions.slf4j.get()}"
)
preferProjectModules()
}
}
}

tasks {
wrapper {
gradleVersion = properties("gradleVersion")
distributionType = Wrapper.DistributionType.ALL
}
}

allprojects {
tasks.withType<Test>().configureEach {
tasks.withType<Test> {
useJUnitPlatform()
maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
maxHeapSize = "2g"
jvmArgs(
Expand All @@ -41,6 +74,14 @@ allprojects {
showStackTraces = true
}
}

}

tasks {
wrapper {
gradleVersion = properties("gradleVersion")
distributionType = Wrapper.DistributionType.ALL
}
}

repositories {
Expand All @@ -49,64 +90,29 @@ repositories {
}

plugins {
kotlin("jvm") version "2.1.20"
id("com.github.ben-manes.versions") version "0.50.0"
kotlin("jvm") // Version is applied globally via settings.gradle.kts
id("com.github.ben-manes.versions") // Version is applied globally via settings.gradle.kts
}

tasks.register("analyzeModuleDependencies") {
group = "verification"
description = "Analyzes dependencies between modules"
doLast {
val projectDependencies = mutableMapOf<Project, Set<Project>>()
subprojects.forEach { project ->
val dependencies = project.configurations
.filter { it.name == "implementation" || it.name == "api" }
.flatMap { it.dependencies }
.filterIsInstance<org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal>()
.map {
@Suppress("DEPRECATION")
it.dependencyProject
// Configure the dependency updates plugin
tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
// Configure resolution strategy to only recommend stable releases
// Other options include: ReleaseCandidate, Milestone, Integration
resolutionStrategy {
componentSelection {
all {
if (isNonStable(candidate.version) && !isNonStable(currentVersion)) {
reject("Release candidate")
}
.toSet()
projectDependencies[project] = dependencies
}
println("Module Dependencies:")
projectDependencies.forEach { (project, dependencies) ->
println("${project.name} depends on: ${dependencies.joinToString { it.name }}")
}
}
}
// Optional: Output results to a file (e.g., JSON, XML, plain text)
// outputFormatter = "json"
// outputDir = "build/dependencyUpdates"
// reportfileName = "report"
}

tasks.register("optimizeDependencies") {
group = "verification"
description = "Analyzes and optimizes dependencies"
doLast {
val allDependencies = mutableMapOf<String, MutableSet<String>>()
subprojects.forEach { project ->
project.configurations
.filter { it.isCanBeResolved }
.forEach { config ->
try {
config.resolvedConfiguration.resolvedArtifacts.forEach { artifact ->
val id = artifact.moduleVersion.id
val key = "${id.group}:${id.name}"
val version = id.version
allDependencies.getOrPut(key) { mutableSetOf() }.add(version)
}
} catch (e: Exception) {

}
}
}
println("Dependency Version Conflicts:")
allDependencies.filter { it.value.size > 1 }.forEach { (dep, versions) ->
println("$dep has multiple versions: ${versions.joinToString()}")
}
}
}

tasks.register("checkAllDependencyUpdates") {
group = "verification"
description = "Checks for dependency updates in all modules"
dependsOn(subprojects.map { "${it.path}:dependencyUpdates" })
// Helper function to check for non-stable versions (adjust keywords as needed)
fun isNonStable(version: String): Boolean {
val unstableKeywords = listOf("rc", "m", "beta", "alpha", "snapshot", "dev", "eap")
return unstableKeywords.any { version.contains(it, ignoreCase = true) }
}
17 changes: 0 additions & 17 deletions buildSrc/build.gradle.kts

This file was deleted.

10 changes: 0 additions & 10 deletions buildSrc/settings.gradle.kts

This file was deleted.

Loading