Skip to content

Commit 7f48a93

Browse files
jinukeujinukeu
committed
Merge branch 'develop' into refactor/modularize-domain
# Conflicts: # build-logic/convention/src/main/java/FeatureComposeConventionPlugin.kt # settings.gradle.kts
2 parents 9fc05c4 + ee3a7f5 commit 7f48a93

File tree

11 files changed

+380
-0
lines changed

11 files changed

+380
-0
lines changed

‎core/designsystem/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎core/designsystem/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
2+
plugins {
3+
id("suwiki.android.library")
4+
id("suwiki.android.library.compose")
5+
}
6+
7+
android {
8+
namespace = "com.suwiki.core.designsystem"
9+
}

‎core/designsystem/consumer-rules.pro

Whitespace-only changes.

‎core/designsystem/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎core/designsystem/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
</manifest>

‎core/designsystem/src/main/java/com/suwiki/core/designsystem/component/Sample.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package com.suwiki.core.designsystem.component

‎schemas/com.suwiki.core.database.OpenLectureDatabase/1.json

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "d388602654d094c34e2c718a802d0243",
6+
"entities": [
7+
{
8+
"tableName": "OpenLectureEntity",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))",
10+
"fields": [
11+
{
12+
"fieldPath": "number",
13+
"columnName": "number",
14+
"affinity": "INTEGER",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "major",
19+
"columnName": "major",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "grade",
25+
"columnName": "grade",
26+
"affinity": "TEXT",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "classNumber",
31+
"columnName": "classNumber",
32+
"affinity": "TEXT",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "classDivideNumber",
37+
"columnName": "classDivideNumber",
38+
"affinity": "TEXT",
39+
"notNull": true
40+
},
41+
{
42+
"fieldPath": "className",
43+
"columnName": "className",
44+
"affinity": "TEXT",
45+
"notNull": true
46+
},
47+
{
48+
"fieldPath": "classification",
49+
"columnName": "classification",
50+
"affinity": "TEXT",
51+
"notNull": true
52+
},
53+
{
54+
"fieldPath": "professor",
55+
"columnName": "professor",
56+
"affinity": "TEXT",
57+
"notNull": true
58+
},
59+
{
60+
"fieldPath": "time",
61+
"columnName": "time",
62+
"affinity": "TEXT",
63+
"notNull": true
64+
},
65+
{
66+
"fieldPath": "credit",
67+
"columnName": "credit",
68+
"affinity": "TEXT",
69+
"notNull": true
70+
}
71+
],
72+
"primaryKey": {
73+
"autoGenerate": false,
74+
"columnNames": [
75+
"number"
76+
]
77+
},
78+
"indices": [],
79+
"foreignKeys": []
80+
}
81+
],
82+
"views": [],
83+
"setupQueries": [
84+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
85+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd388602654d094c34e2c718a802d0243')"
86+
]
87+
}
88+
}

‎schemas/com.suwiki.core.database.OpenLectureDatabase/2.json

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 2,
5+
"identityHash": "d388602654d094c34e2c718a802d0243",
6+
"entities": [
7+
{
8+
"tableName": "OpenLectureEntity",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))",
10+
"fields": [
11+
{
12+
"fieldPath": "number",
13+
"columnName": "number",
14+
"affinity": "INTEGER",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "major",
19+
"columnName": "major",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "grade",
25+
"columnName": "grade",
26+
"affinity": "TEXT",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "classNumber",
31+
"columnName": "classNumber",
32+
"affinity": "TEXT",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "classDivideNumber",
37+
"columnName": "classDivideNumber",
38+
"affinity": "TEXT",
39+
"notNull": true
40+
},
41+
{
42+
"fieldPath": "className",
43+
"columnName": "className",
44+
"affinity": "TEXT",
45+
"notNull": true
46+
},
47+
{
48+
"fieldPath": "classification",
49+
"columnName": "classification",
50+
"affinity": "TEXT",
51+
"notNull": true
52+
},
53+
{
54+
"fieldPath": "professor",
55+
"columnName": "professor",
56+
"affinity": "TEXT",
57+
"notNull": true
58+
},
59+
{
60+
"fieldPath": "time",
61+
"columnName": "time",
62+
"affinity": "TEXT",
63+
"notNull": true
64+
},
65+
{
66+
"fieldPath": "credit",
67+
"columnName": "credit",
68+
"affinity": "TEXT",
69+
"notNull": true
70+
}
71+
],
72+
"primaryKey": {
73+
"autoGenerate": false,
74+
"columnNames": [
75+
"number"
76+
]
77+
},
78+
"indices": [],
79+
"foreignKeys": []
80+
}
81+
],
82+
"views": [],
83+
"setupQueries": [
84+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
85+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd388602654d094c34e2c718a802d0243')"
86+
]
87+
}
88+
}

‎schemas/com.suwiki.core.database.OpenMajorDatabase/1.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "a7aa694667974b6b111d2d7755530138",
6+
"entities": [
7+
{
8+
"tableName": "OpenMajorEntity",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
10+
"fields": [
11+
{
12+
"fieldPath": "name",
13+
"columnName": "name",
14+
"affinity": "TEXT",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "id",
19+
"columnName": "id",
20+
"affinity": "INTEGER",
21+
"notNull": true
22+
}
23+
],
24+
"primaryKey": {
25+
"autoGenerate": true,
26+
"columnNames": [
27+
"id"
28+
]
29+
},
30+
"indices": [],
31+
"foreignKeys": []
32+
}
33+
],
34+
"views": [],
35+
"setupQueries": [
36+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
37+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a7aa694667974b6b111d2d7755530138')"
38+
]
39+
}
40+
}

‎schemas/com.suwiki.core.database.OpenMajorDatabase/2.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 2,
5+
"identityHash": "a7aa694667974b6b111d2d7755530138",
6+
"entities": [
7+
{
8+
"tableName": "OpenMajorEntity",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
10+
"fields": [
11+
{
12+
"fieldPath": "name",
13+
"columnName": "name",
14+
"affinity": "TEXT",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "id",
19+
"columnName": "id",
20+
"affinity": "INTEGER",
21+
"notNull": true
22+
}
23+
],
24+
"primaryKey": {
25+
"autoGenerate": true,
26+
"columnNames": [
27+
"id"
28+
]
29+
},
30+
"indices": [],
31+
"foreignKeys": []
32+
}
33+
],
34+
"views": [],
35+
"setupQueries": [
36+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
37+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a7aa694667974b6b111d2d7755530138')"
38+
]
39+
}
40+
}

‎schemas/com.suwiki.core.database.TimetableDatabase/1.json

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "fdfd5ad0cd87be70a7007f51d26b3ff7",
6+
"entities": [
7+
{
8+
"tableName": "TimetableEntity",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`number` INTEGER NOT NULL, `major` TEXT NOT NULL, `grade` TEXT NOT NULL, `classNumber` TEXT NOT NULL, `classDivideNumber` TEXT NOT NULL, `className` TEXT NOT NULL, `classification` TEXT NOT NULL, `professor` TEXT NOT NULL, `time` TEXT NOT NULL, `credit` TEXT NOT NULL, PRIMARY KEY(`number`))",
10+
"fields": [
11+
{
12+
"fieldPath": "number",
13+
"columnName": "number",
14+
"affinity": "INTEGER",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "major",
19+
"columnName": "major",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "grade",
25+
"columnName": "grade",
26+
"affinity": "TEXT",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "classNumber",
31+
"columnName": "classNumber",
32+
"affinity": "TEXT",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "classDivideNumber",
37+
"columnName": "classDivideNumber",
38+
"affinity": "TEXT",
39+
"notNull": true
40+
},
41+
{
42+
"fieldPath": "className",
43+
"columnName": "className",
44+
"affinity": "TEXT",
45+
"notNull": true
46+
},
47+
{
48+
"fieldPath": "classification",
49+
"columnName": "classification",
50+
"affinity": "TEXT",
51+
"notNull": true
52+
},
53+
{
54+
"fieldPath": "professor",
55+
"columnName": "professor",
56+
"affinity": "TEXT",
57+
"notNull": true
58+
},
59+
{
60+
"fieldPath": "time",
61+
"columnName": "time",
62+
"affinity": "TEXT",
63+
"notNull": true
64+
},
65+
{
66+
"fieldPath": "credit",
67+
"columnName": "credit",
68+
"affinity": "TEXT",
69+
"notNull": true
70+
}
71+
],
72+
"primaryKey": {
73+
"autoGenerate": false,
74+
"columnNames": [
75+
"number"
76+
]
77+
},
78+
"indices": [],
79+
"foreignKeys": []
80+
}
81+
],
82+
"views": [],
83+
"setupQueries": [
84+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
85+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fdfd5ad0cd87be70a7007f51d26b3ff7')"
86+
]
87+
}
88+
}

0 commit comments

Comments
 (0)