Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8282923

Browse files
github2136github2136
committed
merge dev
2 parents 8d7a12e + 2a8ed49 commit 8282923

File tree

16 files changed

+280
-211
lines changed

16 files changed

+280
-211
lines changed

‎.gitignore‎

Lines changed: 11 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,13 @@
1-
2-
# Created by https://www.gitignore.io/api/androidstudio
3-
4-
### AndroidStudio ###
5-
# Covers files to be ignored for android development using Android Studio.
6-
7-
# Built application files
8-
*.apk
9-
*.ap_
10-
11-
# Files for the ART/Dalvik VM
12-
*.dex
13-
14-
# Java class files
15-
*.class
16-
17-
# Generated files
18-
bin/
19-
gen/
20-
out/
21-
22-
# Gradle files
23-
.gradle
24-
.gradle/
25-
build/
26-
27-
# Signing files
28-
.signing/
29-
30-
# Local configuration file (sdk path, etc)
31-
local.properties
32-
33-
# Proguard folder generated by Eclipse
34-
proguard/
35-
36-
# Log Files
37-
*.log
38-
39-
# Android Studio
40-
/*/build/
41-
/*/local.properties
42-
/*/out
43-
/*/*/build
44-
/*/*/production
45-
captures/
46-
.navigation/
47-
*.ipr
48-
*~
49-
*.swp
50-
51-
# Android Patch
52-
gen-external-apklibs
53-
54-
# External native build folder generated in Android Studio 2.2 and later
55-
.externalNativeBuild
56-
57-
# NDK
58-
obj/
59-
60-
# IntelliJ IDEA
611
*.iml
62-
*.iws
63-
/out/
64-
65-
# User-specific configurations
66-
.idea/libraries/
67-
.idea/workspace.xml
68-
.idea/tasks.xml
69-
.idea/.name
70-
.idea/compiler.xml
71-
.idea/copyright/profiles_settings.xml
72-
.idea/encodings.xml
73-
.idea/misc.xml
74-
.idea/modules.xml
75-
.idea/scopes/scope_settings.xml
76-
.idea/dictionaries
77-
.idea/vcs.xml
78-
.idea/jsLibraryMappings.xml
79-
.idea/datasources.xml
80-
.idea/dataSources.ids
81-
.idea/sqlDataSources.xml
82-
.idea/dynamic.xml
83-
.idea/uiDesigner.xml
84-
85-
# OS-specific files
2+
.gradle
3+
/local.properties
4+
/.idea/caches
5+
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
8610
.DS_Store
87-
.DS_Store?
88-
._*
89-
.Spotlight-V100
90-
.Trashes
91-
ehthumbs.db
92-
Thumbs.db
93-
94-
# Legacy Eclipse project files
95-
.classpath
96-
.project
97-
98-
# Mobile Tools for Java (J2ME)
99-
.mtj.tmp/
100-
101-
# Package Files #
102-
*.war
103-
*.ear
104-
105-
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
106-
hs_err_pid*
107-
108-
## Plugin-specific files:
109-
110-
# mpeltonen/sbt-idea plugin
111-
.idea_modules/
112-
113-
# JIRA plugin
114-
atlassian-ide-plugin.xml
115-
116-
# Mongo Explorer plugin
117-
.idea/mongoSettings.xml
118-
119-
# Crashlytics plugin (for Android Studio and IntelliJ)
120-
com_crashlytics_export_strings.xml
121-
crashlytics.properties
122-
crashlytics-build.properties
123-
fabric.properties
124-
125-
### AndroidStudio Patch ###
126-
127-
!/gradle/wrapper/gradle-wrapper.jar
128-
129-
# End of https://www.gitignore.io/api/androidstudio
11+
/build
12+
/captures
13+
.externalNativeBuild

‎.idea/codeStyles/Project.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/compiler.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jarRepositories.xml‎

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
targetSdkVersion version.targetSdkVersion
1414
versionCode 1
1515
versionName "1.0"
16-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
1818
buildTypes {
1919
release {
@@ -38,7 +38,8 @@ dependencies {
3838
implementation lib['android-recyclerview']
3939
implementation lib['gson']
4040

41-
androidTestImplementation lib['android-test']
42-
testImplementation lib['junit']
43-
androidTestImplementation lib['espresso']
41+
androidTestImplementation lib["android-test"]
42+
androidTestImplementation lib["android-test-ext"]
43+
testImplementation lib["junit"]
44+
androidTestImplementation lib["espresso"]
4445
}

‎app/src/androidTest/java/com/github2136/android_utils/ExampleInstrumentedTest.java‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/src/androidTest/java/com/github2136/android_utils/ExampleInstrumentedTest.kt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.github2136.android_utils
2+
3+
import androidx.test.ext.junit.runners.AndroidJUnit4
4+
import com.github2136.util.JsonUtil
5+
import org.junit.Assert
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
/**
10+
* Created by YB on 2022/5/13
11+
*/
12+
@RunWith(AndroidJUnit4::class)
13+
class ExampleInstrumentedTest {
14+
@Test
15+
fun useAppContext() {
16+
val data = JsonUtil.instance.fromJson<JsonData>("{\"par1\":\"\",\"par2\":\"2\",\"par3\":\"\"}")
17+
Assert.assertNotNull(data)
18+
}
19+
}

0 commit comments

Comments
 (0)