Skip to content
Open
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
9 changes: 8 additions & 1 deletion .github/workflows/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ jobs:
distribution: 'temurin'
cache: gradle

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Install Android SDK (API 35)
run: |
sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0"
yes | sdkmanager --licenses

- name: Create Local Properties
run: touch local.properties

Expand Down Expand Up @@ -170,4 +178,3 @@ jobs:
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_APP_DISTRIBUTION_WEBHOOK_URL }}

8 changes: 8 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ jobs:
distribution: 'temurin'
cache: gradle

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Install Android SDK (API 35)
run: |
sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0"
yes | sdkmanager --licenses

- name: Grant execute permission for gradlew
run: chmod +x gradlew

Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {

android {
namespace = "com.eatssu.android"
compileSdk = 35
compileSdk = 36

/**
* 현재 팀 내 안드로이드 OS 버전
Expand Down
17 changes: 16 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,26 @@
</service>



<!-- 오픈소스 -->
<meta-data
android:name="com.google.android.gms.oss.licenses.enabled"
android:value="true" />

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:excludeFromRecents="true"
android:exported="false"
android:noHistory="true"
tools:node="merge" />

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
android:excludeFromRecents="true"
android:exported="false"
android:noHistory="true"
tools:node="merge" />

<meta-data
android:name="com.naver.maps.map.NCP_KEY_ID"
android:value="${NAVER_MAPS_CLIENT_ID}" />
Expand Down Expand Up @@ -232,4 +247,4 @@
</activity>
</application>

</manifest>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,26 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
}

private fun moveToOss() {
val context = requireContext()
try {
startActivity(Intent(requireContext(), OssLicensesMenuActivity::class.java))
val licensesId = context.resources.getIdentifier("third_party_licenses", "raw", context.packageName)
val metadataId = context.resources.getIdentifier(
"third_party_license_metadata",
"raw",
context.packageName
)
if (licensesId == 0 || metadataId == 0) {
showErrorToast(getString(R.string.toast_oss_load_fail))
Timber.e(
"OSS raw resource missing. third_party_licenses=$licensesId third_party_license_metadata=$metadataId"
)
return
}

startActivity(
Intent(context, OssLicensesMenuActivity::class.java)
.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
)
} catch (e: Exception) {
showErrorToast(getString(R.string.toast_oss_load_fail))
Timber.e("Error opening OSS Licenses: ${e.message}")
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/raw/keep.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:keep="@raw/third_party_licenses,@raw/third_party_license_metadata" />
3 changes: 1 addition & 2 deletions core/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.google.services)
}

android {
Expand Down Expand Up @@ -47,4 +46,4 @@ dependencies {
implementation(libs.firebase.analytics)

implementation(libs.kotlinx.serialization.json)
}
}
2 changes: 1 addition & 1 deletion core/design-system/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ dependencies {

//coil: 이미지 로딩
implementation(libs.coil.compose)
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Feb 17 11:26:14 KST 2023
#Wed Mar 04 15:19:02 KST 2026
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
Expand Down
45 changes: 45 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.