Skip to content

Commit

Permalink
🔧 gradle 플러그인 설정 오류 수정. metadata.json 생성.
Browse files Browse the repository at this point in the history
  • Loading branch information
allbegray committed Apr 11, 2023
1 parent 2cee82c commit a72d7a1
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 7 deletions.
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ plugins {
id 'java'
id 'java-library'
id 'maven-publish'
id 'org.jetbrains.kotlin.jvm' version '1.7.22'
id 'org.jetbrains.kotlin.jvm' version '1.7.22' apply false
id 'org.jetbrains.kotlin.plugin.spring' version '1.7.22' apply false
id "org.jetbrains.kotlin.kapt" version "1.7.22" apply false
id "com.google.devtools.ksp" version "1.7.22-1.0.8" apply false
id "org.jmailen.kotlinter" version "3.13.0"
}

allprojects {
version = "0.0.2"
version = "0.0.3"
group = 'herbaccara'
}

Expand Down
2 changes: 1 addition & 1 deletion openai/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'idea'
id "com.google.devtools.ksp" version "1.7.22-1.0.8"
id "com.google.devtools.ksp"
}

idea {
Expand Down
12 changes: 11 additions & 1 deletion spring-boot-starter-openai/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
plugins {
id 'org.jetbrains.kotlin.plugin.spring' version '1.7.22'
id 'org.jetbrains.kotlin.plugin.spring'
id "org.jetbrains.kotlin.kapt"
}

configurations {
compileOnly {
extendsFrom annotationProcessor
extendsFrom kapt
}
}

dependencies {
Expand All @@ -11,4 +19,6 @@ dependencies {
implementation 'org.springframework.boot:spring-boot:2.7.0'
implementation 'org.springframework.boot:spring-boot-autoconfigure:2.7.0'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.0'
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:2.7.0"
kapt "org.springframework.boot:spring-boot-configuration-processor:2.7.0"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package herbaccara.boot.autoconfigure.openai

import herbaccara.openai.OpenAiService
import herbaccara.openai.log.Logging
import org.springframework.boot.autoconfigure.AutoConfiguration
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
Expand Down Expand Up @@ -29,7 +30,7 @@ class OpenAiAutoConfiguration {
properties.rootUri,
properties.timeout,
properties.validate,
properties.logging,
properties.logging.let { Logging(it.enable, it.level) },
proxy
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package herbaccara.boot.autoconfigure.openai

import herbaccara.openai.OpenAiService
import herbaccara.openai.log.Logging
import herbaccara.openai.log.LoggingLevel
import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.ConstructorBinding
import java.time.Duration
Expand All @@ -14,8 +14,13 @@ data class OpenAiProperties(
val rootUri: String = OpenAiService.BASE_URL,
val timeout: Duration = OpenAiService.DEFAULT_TIMEOUT,
val validate: Boolean = false,
val logging: Logging = Logging(),
val logging: LoggingProperties = LoggingProperties(),
val proxy: ProxyProperties? = null
) {
data class ProxyProperties(val host: String, val port: Int)

data class LoggingProperties(
val enable: Boolean = false,
val level: LoggingLevel = LoggingLevel.BASIC
)
}

0 comments on commit a72d7a1

Please sign in to comment.