Revert "chore: add ktlint (+ git hooks in gradle) (#17)"

This reverts commit a1b82b6.
f-lab-clone · Jul 9, 2023 · 547b93b · 547b93b
1 parent a1b82b6
commit 547b93b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 99 deletions.
diff --git a/.editconfig b/.editconfig
diff --git a/.github/hooks/pre-commit b/.github/hooks/pre-commit
diff --git a/.github/workflows/gradle-build-test-lint.yml → .github/workflows/gradle-build.yml b/.github/workflows/gradle-build-test-lint.yml → .github/workflows/gradle-build.yml
@@ -1,6 +1,9 @@
-name: Gradlew build-test-ktlint
+name: Java CI
 
-on: [push]
+on:
+  pull_request:
+  push:
+    branches: [main]
 
 jobs:
   build:
@@ -13,16 +16,12 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3
-
-      - name: Build And Test with Gradle
-        uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
-        with:
-          arguments: build -x ktlintMainSourceSetCheck -x ktlintTestSourceSetCheck -x ktlintKotlinScriptCheck
-
-      - name: Ktlint check
+      - name: add execute permission
+        run: |
+          chmod +x ./gradlew 
+      - name: Build with Gradle
         uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
         with:
-          arguments: ktlintCheck
+          arguments: build
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,66 +1,52 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "3.1.0"
-    id("io.spring.dependency-management") version "1.1.0"
-    kotlin("jvm") version "1.8.21"
-    kotlin("plugin.spring") version "1.8.21"
-    kotlin("plugin.jpa") version "1.8.21"
-    kotlin("plugin.allopen") version "1.6.21"
-    kotlin("plugin.noarg") version "1.6.21"
-    id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
+	id("org.springframework.boot") version "3.1.0"
+	id("io.spring.dependency-management") version "1.1.0"
+	kotlin("jvm") version "1.8.21"
+	kotlin("plugin.spring") version "1.8.21"
+	kotlin("plugin.jpa") version "1.8.21"
+	kotlin("plugin.allopen") version "1.6.21"
+	kotlin("plugin.noarg") version "1.6.21"
 }
 
 group = "com.example"
 version = "0.0.1-SNAPSHOT"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {
-    mavenCentral()
+	mavenCentral()
 }
 
 dependencies {
-// 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    developmentOnly("org.springframework.boot:spring-boot-devtools")
-// 	runtimeOnly("com.mysql:mysql-connector-j")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-// 	implementation("org.modelmapper:modelmapper:2.4.2")
+//	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+	implementation("org.springframework.boot:spring-boot-starter-web")
+	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+	implementation("org.jetbrains.kotlin:kotlin-reflect")
+	developmentOnly("org.springframework.boot:spring-boot-devtools")
+//	runtimeOnly("com.mysql:mysql-connector-j")
+	testImplementation("org.springframework.boot:spring-boot-starter-test")
+//	implementation("org.modelmapper:modelmapper:2.4.2")
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
-    }
+	kotlinOptions {
+		freeCompilerArgs += "-Xjsr305=strict"
+		jvmTarget = "17"
+	}
 }
 
 tasks.withType<Test> {
-    useJUnitPlatform()
+	useJUnitPlatform()
 }
 
 allOpen {
-    annotation("javax.persistence.Entity")
+	annotation("javax.persistence.Entity")
 }
 
 noArg {
-    annotation("javax.persistence.Entity")
-}
-
-val installLocalGitHook = tasks.register<Copy>("installLocalGitHook") {
-    from("${rootProject.rootDir}/scripts/git-hooks")
-    into(File("${rootProject.rootDir}/.git/hooks"))
-
-    eachFile {
-        mode = "755".toInt(radix = 8)
-    }
-}
-
-tasks.build {
-    dependsOn(installLocalGitHook)
-}
+	annotation("javax.persistence.Entity")
+}
diff --git a/gradlew b/gradlew
diff --git a/src/main/kotlin/com/group4/ticketingservice/TicketingserviceApplication.kt b/src/main/kotlin/com/group4/ticketingservice/TicketingserviceApplication.kt
@@ -7,5 +7,5 @@ import org.springframework.boot.runApplication
 class TicketingserviceApplication
 
 fun main(args: Array<String>) {
-    runApplication<TicketingserviceApplication>(*args)
+	runApplication<TicketingserviceApplication>(*args)
 }
diff --git a/src/main/kotlin/com/group4/ticketingservice/controller/TestController.kt b/src/main/kotlin/com/group4/ticketingservice/controller/TestController.kt
@@ -6,8 +6,9 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 class TestController {
     @GetMapping("/")
-    fun index(): String {
+    fun index(): String{
         println("Hello, World!")
         return "Hello, World!"
     }
-}
+
+}
diff --git a/src/test/kotlin/com/group4/ticketingservice/TicketingserviceApplicationTests.kt b/src/test/kotlin/com/group4/ticketingservice/TicketingserviceApplicationTests.kt
@@ -6,7 +6,8 @@ import org.springframework.boot.test.context.SpringBootTest
 @SpringBootTest
 class TicketingserviceApplicationTests {
 
-    @Test
-    fun contextLoads() {
-    }
+	@Test
+	fun contextLoads() {
+	}
+
 }