[Step1] 모듈 분리

Domain/.gitignore

@@ -0,0 +1 @@
+/build

Domain/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.1' // junit4 지원
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'com.google.truth:truth:1.1.2'
+}

app/src/main/java/edu/nextstep/camp/calculator/domain/Calculator.kt → Domain/src/main/java/edu/nextstep/camp/domain/Calculator.kt

@@ -1,4 +1,4 @@
-package edu.nextstep.camp.calculator.domain
+package edu.nextstep.camp.domain
 
 class Calculator {
     fun calculate(rawExpression: String): Int? {

app/src/main/java/edu/nextstep/camp/calculator/domain/Expression.kt → Domain/src/main/java/edu/nextstep/camp/domain/Expression.kt

@@ -1,4 +1,4 @@
-package edu.nextstep.camp.calculator.domain
+package edu.nextstep.camp.domain
 
 data class Expression(
     private val values: List<Any> = emptyList()

app/src/main/java/edu/nextstep/camp/calculator/domain/Operator.kt → Domain/src/main/java/edu/nextstep/camp/domain/Operator.kt

@@ -1,4 +1,4 @@
-package edu.nextstep.camp.calculator.domain
+package edu.nextstep.camp.domain
 
 enum class Operator(
     val sign: String,

app/src/test/java/edu/nextstep/camp/calculator/domain/CalculatorTest.kt → Domain/src/test/java/edu/nextstep/camp/calculator/domain/CalculatorTest.kt

@@ -1,6 +1,7 @@
 package edu.nextstep.camp.calculator.domain
 
 import com.google.common.truth.Truth.assertThat
+import edu.nextstep.camp.domain.Calculator
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 

app/src/test/java/edu/nextstep/camp/calculator/domain/ExpressionTest.kt → Domain/src/test/java/edu/nextstep/camp/calculator/domain/ExpressionTest.kt

@@ -1,6 +1,8 @@
 package edu.nextstep.camp.calculator.domain
 
 import com.google.common.truth.Truth.assertThat
+import edu.nextstep.camp.domain.Expression
+import edu.nextstep.camp.domain.Operator
 import org.junit.jupiter.api.Test
 
 class ExpressionTest {
@@ -67,7 +69,9 @@ class ExpressionTest {
     @Test
     fun `'32 + 1' 수식이 있을 때, 마지막 1을 제거할 수 있어야 한다`() {
         // given
-        val expression = Expression(listOf(32, Operator.Plus, 1))
+        val expression = Expression(
+            listOf(32, Operator.Plus, 1)
+        )
 
         // when
         val actual = expression.removeLast()

app/build.gradle

@@ -43,6 +43,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 
+    implementation project(':Domain')
+
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.1' // junit4 지원
     testImplementation 'junit:junit:4.13.2'

app/src/main/java/edu/nextstep/camp/calculator/MainActivity.kt

@@ -4,9 +4,8 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import edu.nextstep.camp.calculator.databinding.ActivityMainBinding
-import edu.nextstep.camp.calculator.domain.Calculator
-import edu.nextstep.camp.calculator.domain.Expression
-import edu.nextstep.camp.calculator.domain.Operator
+import edu.nextstep.camp.domain.Calculator
+import edu.nextstep.camp.domain.Expression
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -59,19 +58,19 @@ class MainActivity : AppCompatActivity() {
             binding.textView.text = expression.toString()
         }
         binding.buttonPlus.setOnClickListener {
-            expression += Operator.Plus
+            expression += edu.nextstep.camp.domain.Operator.Plus
             binding.textView.text = expression.toString()
         }
         binding.buttonMinus.setOnClickListener {
-            expression += Operator.Minus
+            expression += edu.nextstep.camp.domain.Operator.Minus
             binding.textView.text = expression.toString()
         }
         binding.buttonMultiply.setOnClickListener {
-            expression += Operator.Multiply
+            expression += edu.nextstep.camp.domain.Operator.Multiply
             binding.textView.text = expression.toString()
         }
         binding.buttonDivide.setOnClickListener {
-            expression += Operator.Divide
+            expression += edu.nextstep.camp.domain.Operator.Divide
             binding.textView.text = expression.toString()
         }
         binding.buttonDelete.setOnClickListener {

settings.gradle

@@ -1,2 +1,3 @@
 include ':app'
 rootProject.name = "AndroidCalculator"
+include ':Domain'