Skip to content
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.

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

dataconnect: integrate codegen into the gradle build #2569

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
87c4832
dataconnect: integrate codegen into the gradle build
dconeybe Nov 18, 2024
bcbc8df
minor doc cleanups
dconeybe Nov 18, 2024
e451068
Merge remote-tracking branch 'origin/master' into GradleCodegen
dconeybe Nov 19, 2024
985d3f2
workflows/android.yml: change node-version to 20 (was 22) based on re…
dconeybe Nov 19, 2024
5ab7abe
README.md: mark gradle codegen tasks as "optional"
dconeybe Nov 19, 2024
9005866
movie-connector/connector.yaml: update comment to give a concrete exa…
dconeybe Nov 19, 2024
1fce124
get rid of ktfmt and spotless, since ktlint is what is used in this repo
dconeybe Nov 19, 2024
510f258
ktlint format the code in dataconnect/buildSrc by running ./gradlew k…
dconeybe Nov 19, 2024
a66e0ae
add the ability to explictly specify the path to the npm executable
dconeybe Nov 19, 2024
b598af6
First start at supporting a nodeExecutable setting in dataconnect.loc…
dconeybe Nov 19, 2024
ee27641
enable specifying nodeExecutable in dataconnect.local.toml as well as…
dconeybe Nov 20, 2024
fda7364
rename dataconnect.local.toml -> dataconnect.local.toml.example
dconeybe Nov 20, 2024
f188cf1
fix calling npm when node is not in the path
dconeybe Nov 20, 2024
1e9d05b
minor plugin refactor
dconeybe Nov 20, 2024
c71a458
move tasks into their own package
dconeybe Nov 20, 2024
957dfed
more file reorganization
dconeybe Nov 20, 2024
6284011
format code with ktlint
dconeybe Nov 20, 2024
b65499c
REVERT ME: detect system info
dconeybe Nov 20, 2024
427e5d7
OperatingSystemProvider.kt added
dconeybe Nov 20, 2024
d35b123
download nodejs binary distro via ktor
dconeybe Nov 20, 2024
16214d1
actually download and save to a file
dconeybe Nov 20, 2024
3704326
download shasums as well
dconeybe Nov 20, 2024
db94e28
add node.js release signing keys
dconeybe Nov 20, 2024
3ee1118
verify downloaded nodejs signatures
dconeybe Nov 20, 2024
608dd81
minor refactor
dconeybe Nov 20, 2024
54b6d8b
verify the sha256 hash of the nodejs binary distribution
dconeybe Nov 20, 2024
d01b098
NodeJS -> NodeJs
dconeybe Nov 20, 2024
67319da
refactor
dconeybe Nov 20, 2024
4600046
unzip too
dconeybe Nov 20, 2024
0c41373
ktlint format the code in dataconnect/buildSrc by running ./gradlew k…
dconeybe Nov 20, 2024
8ef8480
wire up node executable between tasks
dconeybe Nov 20, 2024
9fa40e4
improvements
dconeybe Nov 21, 2024
668a7de
fix untarring symlinks
dconeybe Nov 21, 2024
dc010b1
DownloadNodeJsTask.kt fixed
dconeybe Nov 22, 2024
f09fc20
it finally works in android studio
dconeybe Nov 22, 2024
585c9b2
fixed it all
dconeybe Nov 22, 2024
a4e16ea
ktlint
dconeybe Nov 22, 2024
ee81688
Merge remote-tracking branch 'origin/master' into GradleCodegen
dconeybe Nov 25, 2024
6b771be
OperatingSystem.kt: unhardcode linux-x64 (oops!)
dconeybe Nov 25, 2024
343f660
.github/workflows/android.yml: remove installation of node.js since t…
dconeybe Nov 25, 2024
e47c9ec
specify --stacktrace to gradle when run from github actions, to assis…
dconeybe Nov 25, 2024
fd6d44a
specify --info to gradle when run from github actions, to assist with…
dconeybe Nov 25, 2024
c021ea8
OperatingSystem.kt: fix os detection: got x86 and x86_64 backwards
dconeybe Nov 25, 2024
01cce18
DownloadNodeJsTask.kt: make it compatible with both org.apache.common…
dconeybe Nov 25, 2024
6fd0016
DownloadNodeJsTask.kt: more fixes for NoSuchMethodError
dconeybe Nov 25, 2024
2899860
Allow nodeVersion to be specified in build.gradle.kts
dconeybe Nov 26, 2024
882f073
suppoer caching
dconeybe Nov 26, 2024
ca5a06b
code cleanup
dconeybe Nov 26, 2024
e2f50e9
skip building if dataConnectConfigDir is not set
dconeybe Nov 26, 2024
250d11d
ktlint format the code in dataconnect/buildSrc by running ./gradlew k…
dconeybe Nov 26, 2024
d803c27
revert changes to dataconnect.local.toml
dconeybe Nov 26, 2024
38b4a40
Use ExecOperations since project.exec is deprecated
dconeybe Nov 26, 2024
e5d6589
dataconnect.local.toml.example deleted, as it is obsolete
dconeybe Nov 26, 2024
bd49216
remove --info --stacktrace from CI gradle invocation; it was only the…
dconeybe Nov 26, 2024
096bd45
fix ExecOperations usage
dconeybe Nov 26, 2024
acc8359
rename the gradle property DataConnectGradleCacheDir to dataconnect.g…
dconeybe Nov 26, 2024
553e816
fix gradle configuration cache issues
dconeybe Nov 26, 2024
1e5d5c4
on the way to a cacheable task
dconeybe Nov 26, 2024
69c1961
DownloadNodeJsBinaryDistributionArchiveTask.kt started
dconeybe Nov 26, 2024
e379f48
DownloadNodeJsBinaryDistributionArchiveTask.kt more work
dconeybe Nov 26, 2024
22c3ed7
.gitignore: add .kotlin
dconeybe Nov 27, 2024
60765f4
DownloadNodeJsBinaryDistributionArchiveTask.kt implements downloading…
dconeybe Nov 27, 2024
8174272
download SHASUMS256.txt.asc
dconeybe Nov 27, 2024
024039d
Sha256SignatureVerifier.kt added
dconeybe Nov 27, 2024
2fa6f94
code cleanup
dconeybe Nov 28, 2024
032f17c
DownloadNodeJsBinaryDistributionArchiveTask.kt: done
dconeybe Nov 28, 2024
8947f13
tweaks
dconeybe Nov 28, 2024
14aae3f
remove manual caching
dconeybe Nov 28, 2024
2f7ff97
enable kotlin explicit api mode
dconeybe Nov 28, 2024
ecf3fc1
ExtractArchiveTask.kt skeleton added
dconeybe Nov 28, 2024
7747535
work
dconeybe Nov 28, 2024
fd72edd
fix build
dconeybe Nov 28, 2024
8159400
implement xz
dconeybe Nov 29, 2024
1ef9852
refactor DataConnectTaskBase
dconeybe Nov 29, 2024
d843aeb
pathPrefixComponentStripCount impl started
dconeybe Nov 29, 2024
fdb816c
strip prefix
dconeybe Nov 29, 2024
e830d63
more work
dconeybe Nov 29, 2024
a9f9ceb
show elapsed time
dconeybe Nov 29, 2024
1e1af6c
tweak elapsed time message
dconeybe Nov 29, 2024
68bffd3
big refactor
dconeybe Nov 29, 2024
ba411ed
ktlint
dconeybe Nov 29, 2024
b88e2e8
Merge remote-tracking branch 'origin/master' into GradleCodegen
dconeybe Dec 6, 2024
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
Prev Previous commit
Next Next commit
get rid of ktfmt and spotless, since ktlint is what is used in this repo
  • Loading branch information
dconeybe committed Nov 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 1fce12488dcfe4672516e6d83d0801bcc2c7aade
9 changes: 0 additions & 9 deletions dataconnect/buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@
plugins {
// See https://docs.gradle.org/current/userguide/kotlin_dsl.html#sec:kotlin-dsl_plugin
`kotlin-dsl`
alias(libs.plugins.spotless)
}

java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
@@ -35,11 +34,3 @@ gradlePlugin {
}
}
}

spotless {
kotlin { ktfmt(libs.versions.ktfmt.get()).googleStyle() }
kotlinGradle {
target("*.gradle.kts")
ktfmt(libs.versions.ktfmt.get()).googleStyle()
}
}
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ activityCompose = "1.9.3"
composeBom = "2024.11.00"
googleServices = "4.4.2"
composeNavigation = "2.8.4"
ktfmt = "0.43"

[libraries]
android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "agp" }
@@ -47,4 +46,3 @@ jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref =
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA3" }