updated gitignore

This commit is contained in:
Roman Tsypuk
2017-12-15 23:23:42 +02:00
parent b1e07f762c
commit 86248c511a
7 changed files with 42 additions and 73 deletions

20
.gitignore vendored
View File

@@ -7,25 +7,7 @@
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
# Gradle:
.idea/**/gradle.xml
.idea/**/libraries
.idea/
# CMake
cmake-build-debug/

23
.idea/compiler.xml generated
View File

@@ -1,22 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="personal-sdr-trunk_main" target="1.8" />
<module name="personal-sdr-trunk_test" target="1.8" />
<module name="sdr-trunk_main" target="1.8" />
<module name="sdr-trunk_test" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>

View File

@@ -2,17 +2,22 @@
<library name="org.asynchttpclient:async-http-client:2.0.18" type="repository">
<properties maven-id="org.asynchttpclient:async-http-client:2.0.18" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/imports/slf4j-api-1.7.21.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/async-http-client-2.0.18.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/async-http-client-netty-utils-2.0.18.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-buffer-4.0.42.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-codec-http-4.0.42.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-codec-4.0.42.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-handler-4.0.42.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-transport-native-epoll-4.0.42.Final-linux-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-common-4.0.42.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-transport-4.0.42.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-resolver-dns-2.0.18.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-resolver-2.0.18.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-codec-dns-2.0.18.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/reactive-streams-1.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/netty-reactive-streams-1.0.8.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/javassist-3.20.0-GA.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/axis.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/jaxrpc.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/commons-discovery-0.2.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/activation-1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/java-mail-1.4.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/wsdl4j-1.5.1.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/radioreference-14.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/mina-core-2.0.16.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/mina-http-2.0.16.jar!/" />
<root url="jar://$PROJECT_DIR$/imports/slf4j-api-1.7.21.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

7
.idea/modules.xml generated
View File

@@ -2,7 +2,12 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/sdrtrunk.iml" filepath="$PROJECT_DIR$/sdrtrunk.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/personal-sdr-trunk.iml" filepath="$PROJECT_DIR$/.idea/modules/personal-sdr-trunk.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/personal-sdr-trunk_main.iml" filepath="$PROJECT_DIR$/.idea/modules/personal-sdr-trunk_main.iml" group="sdr-trunk" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/personal-sdr-trunk_test.iml" filepath="$PROJECT_DIR$/.idea/modules/personal-sdr-trunk_test.iml" group="sdr-trunk" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" group="sdr-trunk" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" group="sdr-trunk" />
</modules>
</component>
</project>

1
.idea/vcs.xml generated
View File

@@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@@ -7,6 +7,8 @@ buildscript {
// classpath 'me.champeau.gradle:antlr4-gradle-plugin:0.1'
}
}
apply plugin:'application'
mainClassName = "gui.SDRTrunk"
apply plugin: 'java'
apply plugin: 'idea'
@@ -34,9 +36,19 @@ dependencies {
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:3.8.0'
compile fileTree(dir: 'imports', include: '*.jar')
compile 'org.apache.commons:commons-lang3:3.7'
compile 'org.apache.commons:commons-lang3:3.2.1'
compile 'org.usb4java:libusb4java:1.2.0'
}
task wrapper(type: Wrapper) {
gradleVersion = '4.3.1'
}
jar {
manifest {
attributes(
'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
'Main-Class': 'gui.SDRTrunk'
)
}
}

View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/images" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/config" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="imports" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../jmbe/jmbe/library/jmbe-0.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="org.asynchttpclient:async-http-client:2.0.18" level="project" />
</component>
</module>