Skip to content

Commit 989d707

Browse files
committed
Nativeのみ分割
1 parent 418c464 commit 989d707

38 files changed

+101
-199
lines changed

.gitignore

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,3 @@
1-
### Example user template template
2-
3-
### MG-Git-ignore
4-
docs.felnull.dev
5-
.env
6-
7-
### Example user template
8-
FNJL2x64.dll
9-
FNJL3x64.dll
10-
secring.gpg
11-
test
12-
# IntelliJ project files
13-
.idea
14-
*.iml
15-
out
16-
gen
17-
### Maven template
18-
target/
19-
pom.xml.tag
20-
pom.xml.releaseBackup
21-
pom.xml.versionsBackup
22-
pom.xml.next
23-
release.properties
24-
dependency-reduced-pom.xml
25-
buildNumber.properties
26-
.mvn/timing.properties
27-
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
28-
.mvn/wrapper/maven-wrapper.jar
29-
30-
### Gradle template
31-
.gradle
32-
**/build/
33-
!src/**/build/
34-
35-
# Ignore Gradle GUI config
36-
gradle-app.setting
37-
38-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
39-
!gradle-wrapper.jar
40-
41-
# Cache of project
42-
.gradletasknamecache
43-
44-
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
45-
# gradle/wrapper/gradle-wrapper.properties
46-
471
### Java template
482
# Compiled class file
493
*.class
@@ -142,3 +96,54 @@ fabric.properties
14296
# Android studio 3.1+ serialized cache file
14397
.idea/caches/build_file_checksums.ser
14498

99+
### Example user template template
100+
### Example user template
101+
102+
# IntelliJ project files
103+
.idea
104+
*.iml
105+
out
106+
gen
107+
### Gradle template
108+
.gradle
109+
**/build/
110+
!src/**/build/
111+
112+
# Ignore Gradle GUI config
113+
gradle-app.setting
114+
115+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
116+
!gradle-wrapper.jar
117+
118+
# Cache of project
119+
.gradletasknamecache
120+
121+
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
122+
# gradle/wrapper/gradle-wrapper.properties
123+
124+
### Windows template
125+
# Windows thumbnail cache files
126+
Thumbs.db
127+
Thumbs.db:encryptable
128+
ehthumbs.db
129+
ehthumbs_vista.db
130+
131+
# Dump file
132+
*.stackdump
133+
134+
# Folder config file
135+
[Dd]esktop.ini
136+
137+
# Recycle Bin used on file shares
138+
$RECYCLE.BIN/
139+
140+
# Windows Installer files
141+
*.cab
142+
*.msi
143+
*.msix
144+
*.msm
145+
*.msp
146+
147+
# Windows shortcuts
148+
*.lnk
149+

build.gradle

Lines changed: 6 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,20 @@
11
plugins {
22
id 'java'
3-
id 'maven-publish'
4-
id 'signing'
53
}
64

7-
group 'dev.felnull'
8-
archivesBaseName = "felnull-java-library"
9-
version '1.31'
5+
group fnjl_group
6+
archivesBaseName = fnjl_name
7+
version fnjl_version
108

119
repositories {
1210
mavenCentral()
1311
}
1412

1513
dependencies {
16-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
17-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
14+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
15+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
1816
}
1917

2018
test {
2119
useJUnitPlatform()
22-
}
23-
24-
java {
25-
withJavadocJar()
26-
withSourcesJar()
27-
}
28-
29-
publishing {
30-
publications {
31-
mavenJava(MavenPublication) {
32-
artifactId = 'felnull-java-library'
33-
from components.java
34-
pom {
35-
name = 'FelNullJavaLibrary'
36-
description = 'Java integrated library used by FelNull'
37-
url = 'https://github.com/TeamFelnull/'
38-
licenses {
39-
license {
40-
name = 'GNU Lesser General Public License v3.0'
41-
url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
42-
}
43-
}
44-
developers {
45-
developer {
46-
id = 'FelNull'
47-
name = 'TeamFelNull'
48-
49-
}
50-
developer {
51-
id = 'MORIMORI0317'
52-
name = 'MORIMORI0317'
53-
}
54-
}
55-
scm {
56-
connection = '[email protected]:TeamFelnull/FelNullJavaLibrary.git'
57-
developerConnection = '[email protected]:TeamFelnull/FelNullJavaLibrary.git'
58-
url = 'https://github.com/TeamFelnull/FelNullJavaLibrary'
59-
}
60-
}
61-
}
62-
}
63-
repositories {
64-
maven {
65-
def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2"
66-
def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots"
67-
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
68-
credentials {
69-
username = "${sonatypeUsername}"
70-
password = "${sonatypePassword}"
71-
}
72-
}
73-
}
74-
}
75-
76-
signing {
77-
sign publishing.publications.mavenJava
78-
}
79-
80-
javadoc {
81-
if (JavaVersion.current().isJava9Compatible()) {
82-
options.addBooleanOption('html5', true)
83-
}
84-
options.charSet = 'UTF-8'
85-
options.encoding = 'UTF-8'
86-
}
87-
88-
20+
}

common/build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins {
2+
id 'java'
3+
}
4+
group rootProject.group
5+
archivesBaseName = rootProject.archivesBaseName
6+
version rootProject.version
7+
8+
repositories {
9+
mavenCentral()
10+
}
11+
dependencies {
12+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
13+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
14+
15+
}
File renamed without changes.

src/main/java/dev/felnull/fnjl/FelNullJavaLibrary.java renamed to common/src/main/java/dev/felnull/fnjl/FelNullJavaLibrary.java

File renamed without changes.

src/main/java/dev/felnull/fnjl/ProgressLogger.java renamed to common/src/main/java/dev/felnull/fnjl/ProgressLogger.java

File renamed without changes.

src/main/java/dev/felnull/fnjl/io/FileWatcher.java renamed to common/src/main/java/dev/felnull/fnjl/io/FileWatcher.java

File renamed without changes.

src/main/java/dev/felnull/fnjl/io/FolderWatcher.java renamed to common/src/main/java/dev/felnull/fnjl/io/FolderWatcher.java

File renamed without changes.

src/main/java/dev/felnull/fnjl/io/ProgressWriter.java renamed to common/src/main/java/dev/felnull/fnjl/io/ProgressWriter.java

File renamed without changes.

src/main/java/dev/felnull/fnjl/jni/NativeFileChooser.java renamed to common/src/main/java/dev/felnull/fnjl/jni/NativeFileChooser.java

File renamed without changes.

0 commit comments

Comments
 (0)