Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

라이브러리 버전 업데이트, 타겟 SDK 34 #17

Merged
merged 2 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- 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

Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,6 @@ fabric.properties

!/gradle/wrapper/gradle-wrapper.jar

# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos
# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos
*.txt
planz_key_store
9 changes: 5 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ plugins {
}

android {
namespace = "com.yapp.growth.app"
compileSdk = Configs.COMPILE_SDK

defaultConfig {
Expand Down Expand Up @@ -47,13 +48,13 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_17.toString()
}
packagingOptions {
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
Expand Down
27 changes: 12 additions & 15 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yapp.growth">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".PlanzApplication"
android:name="com.yapp.growth.PlanzApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="${appName}"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Growth">
<activity
android:name=".presentation.ui.splash.SplashActivity"
android:name="com.yapp.growth.presentation.ui.splash.SplashActivity"
android:exported="true"
android:theme="@style/Theme.Growth.Splash"
android:screenOrientation="portrait">
Expand All @@ -28,16 +27,14 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="app.planz.today"
android:scheme="https"/>
<data android:scheme="https"/>
<data android:host="app.planz.today"/>

<data
android:host="app.planz.today"
android:scheme="http"/>
<data android:scheme="http"/>
<data android:host="app.planz.today"/>

<data android:host="kakaolink"
android:scheme="kakao${KAKAO_APP_KEY}" />
<data android:scheme="kakao${KAKAO_APP_KEY}"/>
<data android:host="kakaolink"/>
</intent-filter>
</activity>

Expand All @@ -57,19 +54,19 @@
</activity>

<activity
android:name=".presentation.ui.main.MainActivity"
android:name="com.yapp.growth.presentation.ui.main.MainActivity"
android:exported="false"
android:theme="@style/Theme.Growth"
android:screenOrientation="portrait"/>

<activity
android:name=".presentation.ui.login.LoginActivity"
android:name="com.yapp.growth.presentation.ui.login.LoginActivity"
android:exported="false"
android:theme="@style/Theme.Growth"
android:screenOrientation="portrait"/>

<activity
android:name=".presentation.ui.createPlan.CreatePlanActivity"
android:name="com.yapp.growth.presentation.ui.createPlan.CreatePlanActivity"
android:exported="false"
android:theme="@style/Theme.Growth"
android:screenOrientation="portrait"/>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/yapp/growth/PlanzApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.yapp.growth

import android.app.Application
import com.kakao.sdk.common.KakaoSdk
import com.yapp.growth.app.BuildConfig
import dagger.hilt.android.HiltAndroidApp
import timber.log.Timber

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/yapp/growth/di/AppModule.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.yapp.growth.di

import com.yapp.growth.BuildConfig
import com.yapp.growth.LoginSdk
import com.yapp.growth.app.BuildConfig
import com.yapp.growth.data.api.NetworkSettings
import dagger.Module
import dagger.Provides
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/java/Configs.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
object Configs {
//Android Config
const val COMPILE_SDK = 32
const val COMPILE_SDK = 34

//Android Default Config
const val APPLICATION_ID = "com.yapp.growth"
const val MIN_SDK = 26
const val TARGET_SDK = 32
const val VERSION_CODE = 220805001
const val VERSION_NAME = "1.1.1"
const val TARGET_SDK = 34
const val VERSION_CODE = 231114001
const val VERSION_NAME = "1.2.0"

// App Info
const val APP_NAME = "플랜즈"
Expand Down
18 changes: 9 additions & 9 deletions buildSrc/src/main/java/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ object Versions {
const val ACCOMPANIST_PAGER = "0.24.12-rc"
const val ACCOMPANIST_SYSTEM_UI_CONTROLLER = "0.24.12-rc"
const val ANDROID_APP_COMPAT = "1.4.1"
const val ANDROID_GRADLE_PLUGIN = "7.3.1"
const val ANDROID_GRADLE_PLUGIN = "8.1.2"
const val ANDROID_CORE = "1.7.0"
const val COIL = "1.4.0"
const val COMPOSE = "1.2.0"
const val COMPOSE_ACTIVITY = "1.4.0"
const val COIL = "2.4.0"
const val COMPOSE = "1.5.4"
const val COMPOSE_ACTIVITY = "1.8.0"
const val COMPOSE_CONSTRAINT_LAYOUT = "1.1.0-alpha02"
const val CONSTRAINT_LAYOUT = "2.1.3"
const val COMPOSE_NAVIGATION = "2.5.0"
const val COMPOSE_NAVIGATION = "2.7.5"
const val FIREBASE_BOM = "30.3.1"
const val FIREBASE_CRASHLYTICS = "2.9.1"
const val GOOGLE_SERVICE = "4.3.14"
const val HILT = "2.42"
const val HILT_ANDROID = "1.0.0-beta01"
const val HILT = "2.48.1"
const val HILT_ANDROID = "1.1.0"
const val JUNIT = "4.13.2"
const val KAKAO_SDK = "2.11.0"
const val KOTLIN = "1.7.0"
const val KOTLIN = "1.9.20"
const val KOTLIN_COROUTINES = "1.6.4"
const val KOTLIN_DATETIMES = "0.4.0"
const val MATERIAL_CALENDAR = "1.4.3"
const val LIFECYCLE = "2.4.1"
const val LIFECYCLE = "2.6.2"
const val OKHTTP = "4.3.1"
const val RETROFIT = "2.7.1"
const val SECRETS_GRADLE = "2.0.1"
Expand Down
8 changes: 6 additions & 2 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ plugins {
}

android {
namespace = "com.yapp.growth.data"
compileSdk = Configs.COMPILE_SDK
defaultConfig {
minSdk = Configs.MIN_SDK
targetSdk = Configs.TARGET_SDK
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_17.toString()
}
}

Expand Down
4 changes: 2 additions & 2 deletions domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ plugins {
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon May 16 22:48:54 KST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
8 changes: 4 additions & 4 deletions presentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ plugins {
}

android {
namespace = "com.yapp.growth.presentation"
compileSdk = Configs.COMPILE_SDK

defaultConfig {
minSdk = Configs.MIN_SDK
targetSdk = Configs.TARGET_SDK
vectorDrawables {
useSupportLibrary = true
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_17.toString()
}
buildFeatures {
compose = true
Expand Down