From 23a8151272b474d713b187d94c1b9d50e3a96166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harry=28=EB=B0=B0=ED=98=84=EB=B9=88=29?=
 <harry.urssu@gmail.com>
Date: Mon, 15 Jan 2024 13:34:27 +0900
Subject: [PATCH] =?UTF-8?q?[YDS-#195]=20improve=20:=20gradle=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=20/=20JDK=20version=20update=20(#243)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [YDS-#195] improve : gradle 버전 / JDK version update

* [YDS-#195] improve : yds version update

---------

Co-authored-by: Jung Haesung <48352078+cometj03@users.noreply.github.com>
---
 .github/workflows/buildTest.yml                | 4 ++--
 .github/workflows/deployDevStoryBook.yml       | 4 ++--
 .github/workflows/deployLibraryYDS.yml         | 4 ++--
 DesignSystem/build.gradle                      | 9 ++++-----
 DesignSystem/src/main/AndroidManifest.xml      | 3 +--
 app/storybook/build.gradle                     | 7 ++++---
 app/storybook/src/main/AndroidManifest.xml     | 3 +--
 app/yds-ui-tester/build.gradle                 | 7 ++++---
 app/yds-ui-tester/src/main/AndroidManifest.xml | 3 +--
 build.gradle                                   | 2 +-
 gradle.properties                              | 4 +++-
 gradle/wrapper/gradle-wrapper.properties       | 2 +-
 version.properties                             | 2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/buildTest.yml b/.github/workflows/buildTest.yml
index a73b9aac..17671e75 100644
--- a/.github/workflows/buildTest.yml
+++ b/.github/workflows/buildTest.yml
@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v3
 
       # gradle 빌드을 위해 JDK를 세팅합니다.
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 
diff --git a/.github/workflows/deployDevStoryBook.yml b/.github/workflows/deployDevStoryBook.yml
index 011c08e6..7db53f44 100644
--- a/.github/workflows/deployDevStoryBook.yml
+++ b/.github/workflows/deployDevStoryBook.yml
@@ -22,10 +22,10 @@ jobs:
           properties: 'versionName'
 
       # gradle 빌드을 위해 JDK를 세팅합니다.
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 
diff --git a/.github/workflows/deployLibraryYDS.yml b/.github/workflows/deployLibraryYDS.yml
index 569d7d14..c0dc1af6 100644
--- a/.github/workflows/deployLibraryYDS.yml
+++ b/.github/workflows/deployLibraryYDS.yml
@@ -23,10 +23,10 @@ jobs:
           properties: 'versionName'
 
       # gradle 빌드을 위해 JDK를 세팅합니다.
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 
diff --git a/DesignSystem/build.gradle b/DesignSystem/build.gradle
index 9fcd833c..5234e93d 100644
--- a/DesignSystem/build.gradle
+++ b/DesignSystem/build.gradle
@@ -15,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode((System.getenv("BUILD_NUMBER") as Integer ?: 10000))
-        versionName versionProperties['versionName']
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,11 +27,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
         freeCompilerArgs += [
                 "-Xjvm-default=all",
         ]
@@ -41,6 +39,7 @@ android {
     buildFeatures {
         dataBinding = true
     }
+    namespace 'com.yourssu.design'
 }
 
 afterEvaluate {
diff --git a/DesignSystem/src/main/AndroidManifest.xml b/DesignSystem/src/main/AndroidManifest.xml
index 61c00cee..ae77d9a5 100644
--- a/DesignSystem/src/main/AndroidManifest.xml
+++ b/DesignSystem/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yourssu.design">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name = "android.permission.VIBRATE" />
 </manifest>
\ No newline at end of file
diff --git a/app/storybook/build.gradle b/app/storybook/build.gradle
index 07ada779..db8ba85b 100644
--- a/app/storybook/build.gradle
+++ b/app/storybook/build.gradle
@@ -57,11 +57,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.3"
@@ -70,6 +70,7 @@ android {
         dataBinding = true
         compose = true
     }
+    namespace 'com.yourssu.storybook'
 }
 
 dependencies {
diff --git a/app/storybook/src/main/AndroidManifest.xml b/app/storybook/src/main/AndroidManifest.xml
index 59c69c1b..b58d8f91 100644
--- a/app/storybook/src/main/AndroidManifest.xml
+++ b/app/storybook/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yourssu.storybook">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="false"
diff --git a/app/yds-ui-tester/build.gradle b/app/yds-ui-tester/build.gradle
index fd3e65eb..9df96b25 100644
--- a/app/yds-ui-tester/build.gradle
+++ b/app/yds-ui-tester/build.gradle
@@ -42,16 +42,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {
         dataBinding = true
     }
+    namespace 'com.yourssu.yds_ui_tester'
 }
 
 dependencies {
diff --git a/app/yds-ui-tester/src/main/AndroidManifest.xml b/app/yds-ui-tester/src/main/AndroidManifest.xml
index 340e0b92..1ac2feba 100644
--- a/app/yds-ui-tester/src/main/AndroidManifest.xml
+++ b/app/yds-ui-tester/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yourssu.yds_ui_tester">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="false"
diff --git a/build.gradle b/build.gradle
index 16bd3b74..6041c6e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
 
diff --git a/gradle.properties b/gradle.properties
index 71411d80..45f9cc09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-android.disableAutomaticComponentCreation=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 916d4dd9..553680f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jul 10 02:28:18 KST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/version.properties b/version.properties
index 32dafcc4..789d42cf 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-versionName=2.5.1
+versionName=2.5.2
 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다