Skip to content

Merge AndroidSKK 3.7 #8

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.

Sign up for GitHub

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

Merged
deton merged 1 commit into from
Oct 27, 2024
Merged

Merge AndroidSKK 3.7 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ local.properties
.settings/

/svg

/release
9 changes: 5 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "io.github.deton.androidtutcode"
minSdkVersion 21
targetSdk 34
versionCode 7
versionName "1.4.0"
versionCode 8
versionName "1.5.0"
}

buildTypes {
Expand All @@ -32,15 +32,16 @@ android {
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
jvmTarget = '17'
}
}

dependencies {
implementation files('libs/jdbm-1.0.jar')
/* implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' */
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.core:core-ktx:1.13.1'
}
repositories {
mavenCentral()
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@

<activity android:name=".SKKSettingsActivity"
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
android:label="@string/label_pref_activity" >
android:label="@string/label_pref_activity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".SKKUserDicTool"
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
Expand Down
Loading