- updated grandle

Slqavjanskqi · Aug 6, 2024 · 4af2a1f · 4af2a1f
1 parent 98a45ae
commit 4af2a1f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 31
         versionCode 19
-        versionName '1.4.5'
+        versionName '3.6.5'
     }
 
     buildTypes {
@@ -30,14 +30,15 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     ndkVersion '21.3.6528147'
     androidResources {
         noCompress 'dict'
     }
+    namespace 'org.dslul.openboard.inputmethod.latin'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.dslul.openboard.inputmethod.latin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

diff --git a/...rc/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionarySettingsFragment.kt b/...rc/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionarySettingsFragment.kt
@@ -32,13 +32,15 @@ class DictionarySettingsFragment
     // never null
     private var mCurrentPreferenceMap = TreeMap<String, WordListPreference>()
 
+    @Deprecated("Deprecated in Java")
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         val v = inflater.inflate(R.layout.loading_page, container, true)
         mLoadingView = v.findViewById(R.id.loading_container)
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         val activity = activity
@@ -49,6 +51,7 @@ class DictionarySettingsFragment
         setHasOptionsMenu(true)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onResume() {
         super.onResume()
         mChangedSettings = false
@@ -68,6 +71,7 @@ class DictionarySettingsFragment
         }.start()
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onPause() {
         super.onPause()
         val activity = activity

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/WordListPreference.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/WordListPreference.kt
@@ -37,6 +37,7 @@ class WordListPreference(context: Context?,
         return status == mStatus
     }
 
+    @Deprecated("Deprecated in Java")
     public override fun onCreateView(parent: ViewGroup): View {
         val orphanedView = mInterfaceState.findFirstOrphanedView()
         if (null != orphanedView) return orphanedView // Will be sent to onBindView
@@ -98,6 +99,7 @@ class WordListPreference(context: Context?,
         setStatus(MetadataDbHelper.Companion.STATUS_DELETING)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBindView(view: View) {
         super.onBindView(view)
         (view as ViewGroup).layoutTransition = null

diff --git a/...rc/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt b/...rc/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt
@@ -40,6 +40,7 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC
     private var dayNightPref: TwoStatePreference? = null
 
 
+    @Deprecated("Deprecated in Java")
     override fun onCreate(icicle: Bundle?) {
         super.onCreate(icicle)
         addPreferencesFromResource(R.xml.prefs_screen_appearance)
@@ -59,13 +60,15 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC
                 Settings.PREF_KEYBOARD_HEIGHT_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onResume() {
         super.onResume()
         updateThemePreferencesState()
         CustomInputStyleSettingsFragment.updateCustomInputStylesSummary(
                 findPreference(Settings.PREF_CUSTOM_INPUT_STYLES))
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onPreferenceChange(preference: Preference, value: Any?): Boolean {
         (preference as? ListPreference)?.apply {
             summary = entries[entryValues.indexOfFirst { it == value }]

diff --git a/app/src/main/java/org/dslul/openboard/inputmethodcommon/InputMethodSettingsActivity.kt b/app/src/main/java/org/dslul/openboard/inputmethodcommon/InputMethodSettingsActivity.kt
@@ -10,6 +10,7 @@ import android.preference.PreferenceActivity
  */
 abstract class InputMethodSettingsActivity : PreferenceActivity(), InputMethodSettingsInterface {
     private val mSettings = InputMethodSettingsImpl()
+    @Deprecated("Deprecated in Java")
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         preferenceScreen = preferenceManager.createPreferenceScreen(this)

diff --git a/app/src/main/java/org/dslul/openboard/inputmethodcommon/InputMethodSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethodcommon/InputMethodSettingsFragment.kt
@@ -11,6 +11,7 @@ import android.preference.PreferenceFragment
  */
 abstract class InputMethodSettingsFragment : PreferenceFragment(), InputMethodSettingsInterface {
     private val mSettings = InputMethodSettingsImpl()
+    @Deprecated("Deprecated in Java")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val context: Context = activity
@@ -63,6 +64,7 @@ abstract class InputMethodSettingsFragment : PreferenceFragment(), InputMethodSe
     /**
      * {@inheritDoc}
      */
+    @Deprecated("Deprecated in Java")
     override fun onResume() {
         super.onResume()
         mSettings.updateSubtypeEnabler()

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.21'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong