Skip to content

Commit e0272da

Browse files
halfhphalfhp
committed
update dependencies
1 parent a4d0c32 commit e0272da

6 files changed

Lines changed: 33 additions & 37 deletions

File tree

‎androidplot-core/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ dependencies {
9191
implementation 'com.halfhp.fig:figlib:1.0.11'
9292
implementation 'com.android.support:support-annotations:28.0.0'
9393

94-
testImplementation "org.mockito:mockito-core:3.9.0"
94+
testImplementation "org.mockito:mockito-core:4.0.0"
9595
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
96-
testImplementation "org.robolectric:robolectric:4.5.1"
96+
testImplementation "org.robolectric:robolectric:4.7.3"
9797
}
9898

9999
task javadoc(type: Javadoc) {

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
ext {
18-
theCompileSdkVersion = 30
19-
theTargetSdkVersion = 30
18+
theCompileSdkVersion = 32
19+
theTargetSdkVersion = 32
2020
theMinSdkVersion = 5
2121
theVersionName = '1.5.10'
2222
theVersionCode = 226

‎demoapp/build.gradle‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.5.31'
18+
ext.kotlin_version = '1.7.10'
1919
repositories {
2020
mavenCentral()
2121
}
@@ -33,16 +33,12 @@ plugins {
3333
apply plugin: 'kotlin-android'
3434

3535
dependencies {
36-
implementation "androidx.core:core-ktx:1.6.0"
36+
implementation "androidx.core:core-ktx:1.8.0"
3737
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3838
implementation project(':androidplot-core')
3939
implementation 'androidx.recyclerview:recyclerview:1.2.1'
4040

41-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
42-
43-
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
44-
45-
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
41+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
4642
}
4743

4844
android {

‎demoapp/src/main/AndroidManifest.xml‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,76 +27,88 @@
2727
android:icon="@drawable/ic_launcher">
2828

2929
<activity android:name=".MainActivity"
30-
android:label="@string/app_name">
30+
android:label="@string/app_name"
31+
android:exported="true">
3132
<intent-filter>
3233
<action android:name="android.intent.action.MAIN" />
3334
<category android:name="android.intent.category.LAUNCHER" />
3435
</intent-filter>
3536
</activity>
3637
<activity android:name=".SimplePieChartActivity"
37-
android:label="@string/app_name">
38+
android:label="@string/app_name"
39+
android:exported="false">
3840
<intent-filter>
3941
<category android:name="android.intent.category.LAUNCHER"/>
4042
</intent-filter>
4143
</activity>
4244
<activity android:name=".AnimatedXYPlotActivity"
43-
android:label="@string/app_name">
45+
android:label="@string/app_name"
46+
android:exported="false">
4447
<intent-filter>
4548
<category android:name="android.intent.category.LAUNCHER"/>
4649
</intent-filter>
4750
</activity>
4851
<activity android:name=".SimpleXYPlotActivity"
49-
android:label="@string/app_name">
52+
android:label="@string/app_name"
53+
android:exported="false">
5054
<intent-filter>
5155
<category android:name="android.intent.category.LAUNCHER" />
5256
</intent-filter>
5357
</activity>
5458
<activity android:name=".ScatterPlotActivity"
55-
android:label="@string/app_name">
59+
android:label="@string/app_name"
60+
android:exported="false">
5661
<intent-filter>
5762
<category android:name="android.intent.category.LAUNCHER" />
5863
</intent-filter>
5964
</activity>
6065
<activity android:name=".BarPlotExampleActivity"
61-
android:label="@string/app_name">
66+
android:label="@string/app_name"
67+
android:exported="false">
6268
<intent-filter>
6369
<category android:name="android.intent.category.LAUNCHER"/>
6470
</intent-filter>
6571
</activity>
6672
<activity android:name=".DynamicXYPlotActivity"
67-
android:label="@string/app_name">
73+
android:label="@string/app_name"
74+
android:exported="false">
6875
<intent-filter>
6976
<category android:name="android.intent.category.LAUNCHER"/>
7077
</intent-filter>
7178
</activity>
7279
<activity android:name=".CandlestickChartActivity"
73-
android:label="@string/app_name">
80+
android:label="@string/app_name"
81+
android:exported="false">
7482
<intent-filter>
7583
<category android:name="android.intent.category.LAUNCHER"/>
7684
</intent-filter>
7785
</activity>
7886
<activity android:name=".OrientationSensorExampleActivity"
7987
android:label="@string/app_name"
80-
android:screenOrientation="landscape">
88+
android:screenOrientation="landscape"
89+
android:exported="false">
8190
<intent-filter>
8291
<category android:name="android.intent.category.LAUNCHER" />
8392
</intent-filter>
8493
</activity>
8594
<activity android:name=".StepChartExampleActivity"
86-
android:label="@string/app_name">
95+
android:label="@string/app_name"
96+
android:exported="false">
8797
<intent-filter>
8898
<category android:name="android.intent.category.LAUNCHER" />
8999
</intent-filter>
90100
</activity>
91101
<activity android:name=".TouchZoomExampleActivity"
92-
android:label="@string/app_name">
102+
android:label="@string/app_name"
103+
android:exported="false">
93104
<intent-filter>
94105
<category android:name="android.intent.category.LAUNCHER" />
95106
</intent-filter>
96107
</activity>
97108
<activity android:name=".ListViewActivity" android:label="ListView Example"/>
98109
<activity android:name=".RecyclerViewActivity" android:label="RecyclerView Example"/>
99-
<activity android:name=".XYRegionExampleActivity" android:label="XYRegion Example">
110+
<activity android:name=".XYRegionExampleActivity" android:label="XYRegion Example"
111+
android:exported="false">
100112
<intent-filter>
101113
<category android:name="android.intent.category.LAUNCHER" />
102114
</intent-filter>
@@ -112,7 +124,8 @@
112124
<receiver
113125
android:icon="@drawable/ic_launcher"
114126
android:label="Example Widget"
115-
android:name="com.androidplot.demos.widget.DemoAppWidgetProvider" >
127+
android:name="com.androidplot.demos.widget.DemoAppWidgetProvider"
128+
android:exported="false">
116129
<intent-filter >
117130
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
118131
</intent-filter>

‎demoapp/src/main/java/com/androidplot/demos/DemoApplication.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ public class DemoApplication extends Application {
88

99
@Override public void onCreate() {
1010
super.onCreate();
11-
initLeakCanary();
12-
}
13-
14-
protected void initLeakCanary() {
15-
if (LeakCanary.isInAnalyzerProcess(this)) {
16-
return;
17-
}
18-
LeakCanary.install(this);
1911
}
2012
}
2113

‎demoapp/src/main/java/com/androidplot/demos/MainActivity.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,12 @@ package com.androidplot.demos
1818
import android.app.Activity
1919
import android.os.Bundle
2020
import android.content.Intent
21-
import android.util.Log
2221
import com.androidplot.demos.databinding.MainBinding
2322

2423
class MainActivity : Activity() {
2524

2625
private lateinit var binding: MainBinding
2726

28-
companion object {
29-
private val TAG = MainActivity::class.java.name
30-
}
31-
3227
public override fun onCreate(savedInstanceState: Bundle?) {
3328
super.onCreate(savedInstanceState)
3429
binding = MainBinding.inflate(layoutInflater)

0 commit comments

Comments
 (0)