diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2023-12-08 15:47:52 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2023-12-08 17:57:22 +0300 |
| commit | 66b6b0e179bdb3c483a3e80fc100024fdcc74806 (patch) | |
| tree | 07eaf926cd738cda0f61794c0157bbd0e1004034 | |
| parent | aa0ed015dee9afdcd2050ef74742121a8880df91 (diff) | |
| download | ydb-66b6b0e179bdb3c483a3e80fc100024fdcc74806.tar.gz | |
Parse attributes tree with - as divider in generator spec and semantics
| -rw-r--r-- | build/conf/java.conf | 18 | ||||
| -rw-r--r-- | build/export_generators/gradle/generator.toml | 8 | ||||
| -rw-r--r-- | build/export_generators/ide-gradle/generator.toml | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 6a57b33eb9..a50e0e7b0f 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -504,9 +504,9 @@ macro LOCAL_SOURCES_JAR(File) { JAVA_CONTRIB_SEM= \ ${hide:TARGET} ${hide:AUTO_INPUT} \ consumer_classpath $EXPORT_GRADLE_CLASSPATH \ - && consumer.classpath $EXPORT_GRADLE_CLASSPATH \ - && consumer.jar ${MODDIR}/${REALPRJNAME}.jar \ - && consumer.type contrib \ + && consumer-classpath $EXPORT_GRADLE_CLASSPATH \ + && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \ + && consumer-type contrib \ && peers_closure $MANAGED_PEERS_CLOSURE \ && peers_closure_coords $EXPORT_GRADLE_CLASSPATH_GLOBAL \ && IGNORED @@ -867,9 +867,9 @@ BUILD_JAR_SEM= \ ${hide:TARGET} ${hide:AUTO_INPUT} ${hide:APPLIED_EXCLUDES} \ jar $MODDIR $REALPRJNAME \ && consumer_classpath $EXPORT_GRADLE_CLASSPATH \ - && consumer.classpath $EXPORT_GRADLE_CLASSPATH \ - && consumer.jar ${MODDIR}/${REALPRJNAME}.jar \ - && consumer.type library \ + && consumer-classpath $EXPORT_GRADLE_CLASSPATH \ + && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \ + && consumer-type library \ && excludes_rules $EXCLUDE_VALUE \ $_KOTLIN_SEM \ $_JAR_MAIN_SEM \ @@ -881,9 +881,9 @@ BUILD_PROTO_JAR_SEM= \ jar_proto $MODDIR $REALPRJNAME \ $_JAVA_PROTO_SEM \ && consumer_classpath $EXPORT_GRADLE_CLASSPATH \ - && consumer.classpath $EXPORT_GRADLE_CLASSPATH \ - && consumer.jar ${MODDIR}/${REALPRJNAME}.jar \ - && consumer.type library \ + && consumer-classpath $EXPORT_GRADLE_CLASSPATH \ + && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \ + && consumer-type library \ $_KOTLIN_SEM # tag:java-specific tag:internal diff --git a/build/export_generators/gradle/generator.toml b/build/export_generators/gradle/generator.toml index 1083c6ce62..1226cdcdcb 100644 --- a/build/export_generators/gradle/generator.toml +++ b/build/export_generators/gradle/generator.toml @@ -50,10 +50,10 @@ with_kotlinc_plugin_serialization="bool" [attrs.induced] consumer_classpath="list" -"consumer.classpath"="list" -"consumer.jar"="list" -"consumer.type"="list" -"consumer.prebuilt"="flag" +consumer-classpath="str" +consumer-jar="str" +consumer-type="str" +consumer-prebuilt="flag" [merge] test=[ diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml index d28811b55a..caa507e89b 100644 --- a/build/export_generators/ide-gradle/generator.toml +++ b/build/export_generators/ide-gradle/generator.toml @@ -50,10 +50,10 @@ with_kotlinc_plugin_serialization="bool" [attrs.induced] consumer_classpath="list" -"consumer.classpath"="list" -"consumer.jar"="list" -"consumer.type"="list" -"consumer.prebuilt"="flag" +consumer-classpath="str" +consumer-jar="str" +consumer-type="str" +consumer-prebuilt="flag" [merge] test=[ |