Skip to content

Commit 628ba31

Browse files
thagikurathagikura
authored
Update the target sdk version and library versions (#509)
* Update the target sdk version and library versions
1 parent 1e147f5 commit 628ba31

File tree

8 files changed

+33
-37
lines changed

8 files changed

+33
-37
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
build:
44
working_directory: ~/code
55
docker:
6-
- image: circleci/android:api-28-alpha
6+
- image: circleci/android:api-29
77
environment:
88
JVM_OPTS: -Xmx3200m
99
MAX_RETRY: 4

‎build.gradle‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,21 @@
1919
buildscript {
2020
ext {
2121
minSdkVersion = 14
22-
targetSdkVersion = 28
23-
compileSdkVersion = 28
22+
targetSdkVersion = 29
23+
compileSdkVersion = 29
2424

25-
androidGradlePluginVersion = "3.2.1"
25+
androidGradlePluginVersion = "3.5.0"
2626
androidMavenGradlePluginVersion = "1.5"
27-
androidxAnnotationVersion = "1.0.0"
28-
androidxAppCompatVersion = "1.0.2"
29-
androidxCoreVersion = "1.0.1"
30-
androidxLegacySupportV4Version = "1.0.0"
31-
androidxPreferenceVersion = "1.0.0"
32-
androidxPreferenceV14Version = "1.0.0"
27+
androidxAnnotationVersion = "1.1.0"
28+
androidxAppCompatVersion = "1.1.0"
29+
androidxCoreVersion = "1.1.0"
30+
androidxPreferenceVersion = "1.1.0"
3331
androidxRecyclerViewVersion = "1.0.0"
34-
androidxEspressoVersion = "3.1.0"
35-
androidxTestVersion = "1.1.0-alpha4"
32+
androidxEspressoVersion = "3.2.0"
33+
androidxTestVersion = "1.2.0"
3634
junitVersion = "4.12"
3735
gradleBintrayPluginVersion = "1.6"
38-
kotlinVersion = "1.3.11"
36+
kotlinVersion = "1.3.50"
3937
materialVersion = "1.0.0"
4038
}
4139

‎demo-playground/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ android {
4040

4141
dependencies {
4242
implementation project(":flexbox")
43-
implementation "androidx.legacy:legacy-support-v4:${rootProject.androidxLegacySupportV4Version}"
4443
implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
4544
implementation "androidx.preference:preference:${rootProject.androidxPreferenceVersion}"
46-
implementation "androidx.legacy:legacy-preference-v14:${rootProject.androidxPreferenceV14Version}"
4745
implementation "com.google.android.material:material:${rootProject.materialVersion}"
4846
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4947

‎demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ internal class FlexItemEditFragment : DialogFragment() {
6666
override fun onCreate(savedInstanceState: Bundle?) {
6767
super.onCreate(savedInstanceState)
6868
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
69-
setStyle(DialogFragment.STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog)
69+
setStyle(STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog)
7070
} else {
71-
setStyle(DialogFragment.STYLE_NORMAL, android.R.style.Theme_Dialog)
71+
setStyle(STYLE_NORMAL, android.R.style.Theme_Dialog)
7272
}
7373
arguments?.let {
74-
flexItem = it.getParcelable(FLEX_ITEM_KEY)
74+
flexItem = it.getParcelable(FLEX_ITEM_KEY)!!
7575
viewIndex = it.getInt(VIEW_INDEX_KEY)
7676
}
7777
flexItemInEdit = createNewFlexItem(flexItem)
@@ -89,7 +89,7 @@ internal class FlexItemEditFragment : DialogFragment() {
8989
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
9090
savedInstanceState: Bundle?): View? {
9191
val view = inflater.inflate(R.layout.fragment_flex_item_edit, container, false)
92-
dialog.setTitle((viewIndex + 1).toString())
92+
dialog?.setTitle((viewIndex + 1).toString())
9393

9494
val context = activity ?: return view
9595
val orderTextInput: TextInputLayout = view.findViewById(R.id.input_layout_order)
@@ -176,7 +176,7 @@ internal class FlexItemEditFragment : DialogFragment() {
176176
widthEdit, heightEdit, minWidthEdit, minHeightEdit, maxWidthEdit, maxHeightEdit)
177177

178178
val alignSelfSpinner: Spinner = view.findViewById(R.id.spinner_align_self)
179-
val arrayAdapter = ArrayAdapter.createFromResource(activity,
179+
val arrayAdapter = ArrayAdapter.createFromResource(requireActivity(),
180180
R.array.array_align_self, R.layout.spinner_item)
181181
alignSelfSpinner.adapter = arrayAdapter
182182
alignSelfSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {

‎demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class FlexboxLayoutFragment : Fragment() {
4848
fragmentHelper.initializeViews()
4949
if (savedInstanceState != null) {
5050
val flexItems = savedInstanceState
51-
.getParcelableArrayList<FlexItem>(FLEX_ITEMS_KEY)
51+
.getParcelableArrayList<FlexItem>(FLEX_ITEMS_KEY)!!
5252
flexContainer.removeAllViews()
5353
for (i in flexItems.indices) {
5454
val flexItem = flexItems[i]

‎demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ internal class FragmentHelper(private val activity: MainActivity, private val fl
121121

122122
private fun readPreferenceAsInteger(key: String, defValue: String): Int {
123123
return if (sharedPreferences.contains(key)) {
124-
sharedPreferences.getString(key, defValue).toIntOrNull() ?: defValue.toInt()
124+
sharedPreferences.getString(key, defValue)?.toIntOrNull() ?: defValue.toInt()
125125
} else {
126126
defValue.toInt()
127127
}
128128
}
129129

130130
private fun readPreferenceAsFloat(key: String, defValue: String): Float {
131131
return if (sharedPreferences.contains(key)) {
132-
sharedPreferences.getString(key, defValue).toFloatOrNull() ?: defValue.toFloat()
132+
sharedPreferences.getString(key, defValue)?.toFloatOrNull() ?: defValue.toFloat()
133133
} else {
134134
defValue.toFloat()
135135
}

‎demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ internal class SettingsActivity : FragmentActivity() {
4747
addPreferencesFromResource(R.xml.new_flex_item_preferences)
4848

4949
val orderPreference = findPreference(
50-
getString(R.string.new_flex_item_order_key)) as EditTextPreference
51-
orderPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
50+
getString(R.string.new_flex_item_order_key)) as EditTextPreference?
51+
orderPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
5252
val validator = IntegerInputValidator()
5353
if (!validator.isValidInput(newValue.toString())) {
5454
Toast.makeText(activity,
@@ -60,8 +60,8 @@ internal class SettingsActivity : FragmentActivity() {
6060
}
6161

6262
val flexGrowPreference = findPreference(
63-
getString(R.string.new_flex_grow_key)) as EditTextPreference
64-
flexGrowPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
63+
getString(R.string.new_flex_grow_key)) as EditTextPreference?
64+
flexGrowPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
6565
val validator = NonNegativeDecimalInputValidator()
6666
if (!validator.isValidInput(newValue.toString())) {
6767
Toast.makeText(activity,
@@ -73,8 +73,8 @@ internal class SettingsActivity : FragmentActivity() {
7373
}
7474

7575
val flexShrinkPreference = findPreference(
76-
getString(R.string.new_flex_shrink_key)) as EditTextPreference
77-
flexShrinkPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
76+
getString(R.string.new_flex_shrink_key)) as EditTextPreference?
77+
flexShrinkPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
7878
val validator = NonNegativeDecimalInputValidator()
7979
if (!validator.isValidInput(newValue.toString())) {
8080
Toast.makeText(activity,
@@ -86,8 +86,8 @@ internal class SettingsActivity : FragmentActivity() {
8686
}
8787

8888
val flexBasisPercentPreference = findPreference(
89-
getString(R.string.new_flex_basis_percent_key)) as EditTextPreference
90-
flexBasisPercentPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
89+
getString(R.string.new_flex_basis_percent_key)) as EditTextPreference?
90+
flexBasisPercentPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
9191
val validator = FlexBasisPercentInputValidator()
9292
if (!validator.isValidInput(newValue.toString())) {
9393
Toast.makeText(activity,
@@ -99,8 +99,8 @@ internal class SettingsActivity : FragmentActivity() {
9999
}
100100

101101
val widthPreference = findPreference(
102-
getString(R.string.new_width_key)) as EditTextPreference
103-
widthPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
102+
getString(R.string.new_width_key)) as EditTextPreference?
103+
widthPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
104104
val validator = DimensionInputValidator()
105105
if (!validator.isValidInput(newValue.toString())) {
106106
Toast.makeText(activity,
@@ -112,8 +112,8 @@ internal class SettingsActivity : FragmentActivity() {
112112
}
113113

114114
val heightPreference = findPreference(
115-
getString(R.string.new_height_key)) as EditTextPreference
116-
heightPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
115+
getString(R.string.new_height_key)) as EditTextPreference?
116+
heightPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
117117
val validator = DimensionInputValidator()
118118
if (!validator.isValidInput(newValue.toString())) {
119119
Toast.makeText(activity,

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 24 09:09:16 CEST 2018
1+
#Mon Sep 09 14:42:19 PDT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

0 commit comments

Comments
 (0)