diff --git a/annotations/build.gradle b/annotations/build.gradle index a5420beab..475ac2ad8 100644 --- a/annotations/build.gradle +++ b/annotations/build.gradle @@ -3,19 +3,6 @@ plugins { id 'maven-publish' } -sourceSets.main { - java { - srcDirs = ['src'] - } - resources { - srcDirs = ['src'] - include '**/*.properties' - include '**/*.gif' - include '**/*.png' - include '**/*.pro' - } -} - afterEvaluate { publishing { publications.getByName(project.name) { diff --git a/annotations/src/proguard/annotation/Keep.java b/annotations/src/main/java/proguard/annotation/Keep.java similarity index 100% rename from annotations/src/proguard/annotation/Keep.java rename to annotations/src/main/java/proguard/annotation/Keep.java diff --git a/annotations/src/proguard/annotation/KeepApplication.java b/annotations/src/main/java/proguard/annotation/KeepApplication.java similarity index 100% rename from annotations/src/proguard/annotation/KeepApplication.java rename to annotations/src/main/java/proguard/annotation/KeepApplication.java diff --git a/annotations/src/proguard/annotation/KeepClassMemberNames.java b/annotations/src/main/java/proguard/annotation/KeepClassMemberNames.java similarity index 100% rename from annotations/src/proguard/annotation/KeepClassMemberNames.java rename to annotations/src/main/java/proguard/annotation/KeepClassMemberNames.java diff --git a/annotations/src/proguard/annotation/KeepClassMembers.java b/annotations/src/main/java/proguard/annotation/KeepClassMembers.java similarity index 100% rename from annotations/src/proguard/annotation/KeepClassMembers.java rename to annotations/src/main/java/proguard/annotation/KeepClassMembers.java diff --git a/annotations/src/proguard/annotation/KeepGettersSetters.java b/annotations/src/main/java/proguard/annotation/KeepGettersSetters.java similarity index 100% rename from annotations/src/proguard/annotation/KeepGettersSetters.java rename to annotations/src/main/java/proguard/annotation/KeepGettersSetters.java diff --git a/annotations/src/proguard/annotation/KeepImplementations.java b/annotations/src/main/java/proguard/annotation/KeepImplementations.java similarity index 100% rename from annotations/src/proguard/annotation/KeepImplementations.java rename to annotations/src/main/java/proguard/annotation/KeepImplementations.java diff --git a/annotations/src/proguard/annotation/KeepName.java b/annotations/src/main/java/proguard/annotation/KeepName.java similarity index 100% rename from annotations/src/proguard/annotation/KeepName.java rename to annotations/src/main/java/proguard/annotation/KeepName.java diff --git a/annotations/src/proguard/annotation/KeepPublicClassMemberNames.java b/annotations/src/main/java/proguard/annotation/KeepPublicClassMemberNames.java similarity index 100% rename from annotations/src/proguard/annotation/KeepPublicClassMemberNames.java rename to annotations/src/main/java/proguard/annotation/KeepPublicClassMemberNames.java diff --git a/annotations/src/proguard/annotation/KeepPublicClassMembers.java b/annotations/src/main/java/proguard/annotation/KeepPublicClassMembers.java similarity index 100% rename from annotations/src/proguard/annotation/KeepPublicClassMembers.java rename to annotations/src/main/java/proguard/annotation/KeepPublicClassMembers.java diff --git a/annotations/src/proguard/annotation/KeepPublicGettersSetters.java b/annotations/src/main/java/proguard/annotation/KeepPublicGettersSetters.java similarity index 100% rename from annotations/src/proguard/annotation/KeepPublicGettersSetters.java rename to annotations/src/main/java/proguard/annotation/KeepPublicGettersSetters.java diff --git a/annotations/src/proguard/annotation/KeepPublicImplementations.java b/annotations/src/main/java/proguard/annotation/KeepPublicImplementations.java similarity index 100% rename from annotations/src/proguard/annotation/KeepPublicImplementations.java rename to annotations/src/main/java/proguard/annotation/KeepPublicImplementations.java diff --git a/annotations/src/proguard/annotation/KeepPublicProtectedClassMemberNames.java b/annotations/src/main/java/proguard/annotation/KeepPublicProtectedClassMemberNames.java similarity index 100% rename from annotations/src/proguard/annotation/KeepPublicProtectedClassMemberNames.java rename to annotations/src/main/java/proguard/annotation/KeepPublicProtectedClassMemberNames.java diff --git a/annotations/src/proguard/annotation/KeepPublicProtectedClassMembers.java b/annotations/src/main/java/proguard/annotation/KeepPublicProtectedClassMembers.java similarity index 100% rename from annotations/src/proguard/annotation/KeepPublicProtectedClassMembers.java rename to annotations/src/main/java/proguard/annotation/KeepPublicProtectedClassMembers.java diff --git a/ant/build.gradle b/ant/build.gradle index 7a1ccc1c6..a193e4df2 100644 --- a/ant/build.gradle +++ b/ant/build.gradle @@ -10,20 +10,6 @@ repositories { mavenCentral() } -sourceSets.main { - java { - srcDirs = ['src'] - include '**/*.java' - } - resources { - srcDirs = ['src'] - include '**/*.properties' - include '**/*.gif' - include '**/*.png' - include '**/*.pro' - } -} - dependencies { implementation project(':base') implementation 'org.apache.ant:ant:1.10.15' diff --git a/ant/src/proguard/ant/ClassPathElement.java b/ant/src/main/java/proguard/ant/ClassPathElement.java similarity index 100% rename from ant/src/proguard/ant/ClassPathElement.java rename to ant/src/main/java/proguard/ant/ClassPathElement.java diff --git a/ant/src/proguard/ant/ClassSpecificationElement.java b/ant/src/main/java/proguard/ant/ClassSpecificationElement.java similarity index 100% rename from ant/src/proguard/ant/ClassSpecificationElement.java rename to ant/src/main/java/proguard/ant/ClassSpecificationElement.java diff --git a/ant/src/proguard/ant/ConfigurationElement.java b/ant/src/main/java/proguard/ant/ConfigurationElement.java similarity index 100% rename from ant/src/proguard/ant/ConfigurationElement.java rename to ant/src/main/java/proguard/ant/ConfigurationElement.java diff --git a/ant/src/proguard/ant/ConfigurationTask.java b/ant/src/main/java/proguard/ant/ConfigurationTask.java similarity index 100% rename from ant/src/proguard/ant/ConfigurationTask.java rename to ant/src/main/java/proguard/ant/ConfigurationTask.java diff --git a/ant/src/proguard/ant/FilterElement.java b/ant/src/main/java/proguard/ant/FilterElement.java similarity index 100% rename from ant/src/proguard/ant/FilterElement.java rename to ant/src/main/java/proguard/ant/FilterElement.java diff --git a/ant/src/proguard/ant/KeepSpecificationElement.java b/ant/src/main/java/proguard/ant/KeepSpecificationElement.java similarity index 100% rename from ant/src/proguard/ant/KeepSpecificationElement.java rename to ant/src/main/java/proguard/ant/KeepSpecificationElement.java diff --git a/ant/src/proguard/ant/MemberSpecificationElement.java b/ant/src/main/java/proguard/ant/MemberSpecificationElement.java similarity index 100% rename from ant/src/proguard/ant/MemberSpecificationElement.java rename to ant/src/main/java/proguard/ant/MemberSpecificationElement.java diff --git a/ant/src/proguard/ant/ProGuardTask.java b/ant/src/main/java/proguard/ant/ProGuardTask.java similarity index 100% rename from ant/src/proguard/ant/ProGuardTask.java rename to ant/src/main/java/proguard/ant/ProGuardTask.java diff --git a/ant/src/proguard/ant/package.html b/ant/src/main/java/proguard/ant/package.html similarity index 100% rename from ant/src/proguard/ant/package.html rename to ant/src/main/java/proguard/ant/package.html diff --git a/ant/src/proguard/ant/task.properties b/ant/src/main/resources/proguard/ant/task.properties similarity index 100% rename from ant/src/proguard/ant/task.properties rename to ant/src/main/resources/proguard/ant/task.properties diff --git a/gui/build.gradle b/gui/build.gradle index be9e83fe5..7bea6c8d8 100644 --- a/gui/build.gradle +++ b/gui/build.gradle @@ -10,20 +10,6 @@ repositories { mavenCentral() } -sourceSets.main { - java { - srcDirs = ['src'] - include '**/*.java' - } - resources { - srcDirs = ['src'] - include '**/*.properties' - include '**/*.gif' - include '**/*.png' - include '**/*.pro' - } -} - dependencies { implementation project(':base') implementation project(':retrace') diff --git a/gui/src/proguard/gui/ClassPathPanel.java b/gui/src/main/java/proguard/gui/ClassPathPanel.java similarity index 100% rename from gui/src/proguard/gui/ClassPathPanel.java rename to gui/src/main/java/proguard/gui/ClassPathPanel.java diff --git a/gui/src/proguard/gui/ClassSpecificationDialog.java b/gui/src/main/java/proguard/gui/ClassSpecificationDialog.java similarity index 100% rename from gui/src/proguard/gui/ClassSpecificationDialog.java rename to gui/src/main/java/proguard/gui/ClassSpecificationDialog.java diff --git a/gui/src/proguard/gui/ClassSpecificationsPanel.java b/gui/src/main/java/proguard/gui/ClassSpecificationsPanel.java similarity index 100% rename from gui/src/proguard/gui/ClassSpecificationsPanel.java rename to gui/src/main/java/proguard/gui/ClassSpecificationsPanel.java diff --git a/gui/src/proguard/gui/ExtensionFileFilter.java b/gui/src/main/java/proguard/gui/ExtensionFileFilter.java similarity index 100% rename from gui/src/proguard/gui/ExtensionFileFilter.java rename to gui/src/main/java/proguard/gui/ExtensionFileFilter.java diff --git a/gui/src/proguard/gui/FilterBuilder.java b/gui/src/main/java/proguard/gui/FilterBuilder.java similarity index 100% rename from gui/src/proguard/gui/FilterBuilder.java rename to gui/src/main/java/proguard/gui/FilterBuilder.java diff --git a/gui/src/proguard/gui/FilterDialog.java b/gui/src/main/java/proguard/gui/FilterDialog.java similarity index 100% rename from gui/src/proguard/gui/FilterDialog.java rename to gui/src/main/java/proguard/gui/FilterDialog.java diff --git a/gui/src/proguard/gui/GUIResources.java b/gui/src/main/java/proguard/gui/GUIResources.java similarity index 100% rename from gui/src/proguard/gui/GUIResources.java rename to gui/src/main/java/proguard/gui/GUIResources.java diff --git a/gui/src/proguard/gui/JavaUtil.java b/gui/src/main/java/proguard/gui/JavaUtil.java similarity index 100% rename from gui/src/proguard/gui/JavaUtil.java rename to gui/src/main/java/proguard/gui/JavaUtil.java diff --git a/gui/src/proguard/gui/KeepSpecificationsPanel.java b/gui/src/main/java/proguard/gui/KeepSpecificationsPanel.java similarity index 100% rename from gui/src/proguard/gui/KeepSpecificationsPanel.java rename to gui/src/main/java/proguard/gui/KeepSpecificationsPanel.java diff --git a/gui/src/proguard/gui/ListPanel.java b/gui/src/main/java/proguard/gui/ListPanel.java similarity index 100% rename from gui/src/proguard/gui/ListPanel.java rename to gui/src/main/java/proguard/gui/ListPanel.java diff --git a/gui/src/proguard/gui/MemberSpecificationDialog.java b/gui/src/main/java/proguard/gui/MemberSpecificationDialog.java similarity index 100% rename from gui/src/proguard/gui/MemberSpecificationDialog.java rename to gui/src/main/java/proguard/gui/MemberSpecificationDialog.java diff --git a/gui/src/proguard/gui/MemberSpecificationsPanel.java b/gui/src/main/java/proguard/gui/MemberSpecificationsPanel.java similarity index 100% rename from gui/src/proguard/gui/MemberSpecificationsPanel.java rename to gui/src/main/java/proguard/gui/MemberSpecificationsPanel.java diff --git a/gui/src/proguard/gui/MessageDialogRunnable.java b/gui/src/main/java/proguard/gui/MessageDialogRunnable.java similarity index 100% rename from gui/src/proguard/gui/MessageDialogRunnable.java rename to gui/src/main/java/proguard/gui/MessageDialogRunnable.java diff --git a/gui/src/proguard/gui/OptimizationsDialog.java b/gui/src/main/java/proguard/gui/OptimizationsDialog.java similarity index 100% rename from gui/src/proguard/gui/OptimizationsDialog.java rename to gui/src/main/java/proguard/gui/OptimizationsDialog.java diff --git a/gui/src/proguard/gui/ProGuardGUI.java b/gui/src/main/java/proguard/gui/ProGuardGUI.java similarity index 100% rename from gui/src/proguard/gui/ProGuardGUI.java rename to gui/src/main/java/proguard/gui/ProGuardGUI.java diff --git a/gui/src/proguard/gui/ProGuardRunnable.java b/gui/src/main/java/proguard/gui/ProGuardRunnable.java similarity index 100% rename from gui/src/proguard/gui/ProGuardRunnable.java rename to gui/src/main/java/proguard/gui/ProGuardRunnable.java diff --git a/gui/src/proguard/gui/ReTraceRunnable.java b/gui/src/main/java/proguard/gui/ReTraceRunnable.java similarity index 100% rename from gui/src/proguard/gui/ReTraceRunnable.java rename to gui/src/main/java/proguard/gui/ReTraceRunnable.java diff --git a/gui/src/proguard/gui/SwingUtil.java b/gui/src/main/java/proguard/gui/SwingUtil.java similarity index 100% rename from gui/src/proguard/gui/SwingUtil.java rename to gui/src/main/java/proguard/gui/SwingUtil.java diff --git a/gui/src/proguard/gui/TabbedPane.java b/gui/src/main/java/proguard/gui/TabbedPane.java similarity index 100% rename from gui/src/proguard/gui/TabbedPane.java rename to gui/src/main/java/proguard/gui/TabbedPane.java diff --git a/gui/src/proguard/gui/TextAreaOutputStream.java b/gui/src/main/java/proguard/gui/TextAreaOutputStream.java similarity index 100% rename from gui/src/proguard/gui/TextAreaOutputStream.java rename to gui/src/main/java/proguard/gui/TextAreaOutputStream.java diff --git a/gui/src/proguard/gui/TextAreaWriter.java b/gui/src/main/java/proguard/gui/TextAreaWriter.java similarity index 100% rename from gui/src/proguard/gui/TextAreaWriter.java rename to gui/src/main/java/proguard/gui/TextAreaWriter.java diff --git a/gui/src/proguard/gui/package.html b/gui/src/main/java/proguard/gui/package.html similarity index 100% rename from gui/src/proguard/gui/package.html rename to gui/src/main/java/proguard/gui/package.html diff --git a/gui/src/proguard/gui/splash/BufferedSprite.java b/gui/src/main/java/proguard/gui/splash/BufferedSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/BufferedSprite.java rename to gui/src/main/java/proguard/gui/splash/BufferedSprite.java diff --git a/gui/src/proguard/gui/splash/CircleSprite.java b/gui/src/main/java/proguard/gui/splash/CircleSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/CircleSprite.java rename to gui/src/main/java/proguard/gui/splash/CircleSprite.java diff --git a/gui/src/proguard/gui/splash/ClipSprite.java b/gui/src/main/java/proguard/gui/splash/ClipSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/ClipSprite.java rename to gui/src/main/java/proguard/gui/splash/ClipSprite.java diff --git a/gui/src/proguard/gui/splash/ColorSprite.java b/gui/src/main/java/proguard/gui/splash/ColorSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/ColorSprite.java rename to gui/src/main/java/proguard/gui/splash/ColorSprite.java diff --git a/gui/src/proguard/gui/splash/CompositeSprite.java b/gui/src/main/java/proguard/gui/splash/CompositeSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/CompositeSprite.java rename to gui/src/main/java/proguard/gui/splash/CompositeSprite.java diff --git a/gui/src/proguard/gui/splash/ConstantColor.java b/gui/src/main/java/proguard/gui/splash/ConstantColor.java similarity index 100% rename from gui/src/proguard/gui/splash/ConstantColor.java rename to gui/src/main/java/proguard/gui/splash/ConstantColor.java diff --git a/gui/src/proguard/gui/splash/ConstantDouble.java b/gui/src/main/java/proguard/gui/splash/ConstantDouble.java similarity index 100% rename from gui/src/proguard/gui/splash/ConstantDouble.java rename to gui/src/main/java/proguard/gui/splash/ConstantDouble.java diff --git a/gui/src/proguard/gui/splash/ConstantFont.java b/gui/src/main/java/proguard/gui/splash/ConstantFont.java similarity index 100% rename from gui/src/proguard/gui/splash/ConstantFont.java rename to gui/src/main/java/proguard/gui/splash/ConstantFont.java diff --git a/gui/src/proguard/gui/splash/ConstantInt.java b/gui/src/main/java/proguard/gui/splash/ConstantInt.java similarity index 100% rename from gui/src/proguard/gui/splash/ConstantInt.java rename to gui/src/main/java/proguard/gui/splash/ConstantInt.java diff --git a/gui/src/proguard/gui/splash/ConstantString.java b/gui/src/main/java/proguard/gui/splash/ConstantString.java similarity index 100% rename from gui/src/proguard/gui/splash/ConstantString.java rename to gui/src/main/java/proguard/gui/splash/ConstantString.java diff --git a/gui/src/proguard/gui/splash/ConstantTiming.java b/gui/src/main/java/proguard/gui/splash/ConstantTiming.java similarity index 100% rename from gui/src/proguard/gui/splash/ConstantTiming.java rename to gui/src/main/java/proguard/gui/splash/ConstantTiming.java diff --git a/gui/src/proguard/gui/splash/FontSprite.java b/gui/src/main/java/proguard/gui/splash/FontSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/FontSprite.java rename to gui/src/main/java/proguard/gui/splash/FontSprite.java diff --git a/gui/src/proguard/gui/splash/ImageSprite.java b/gui/src/main/java/proguard/gui/splash/ImageSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/ImageSprite.java rename to gui/src/main/java/proguard/gui/splash/ImageSprite.java diff --git a/gui/src/proguard/gui/splash/LinearColor.java b/gui/src/main/java/proguard/gui/splash/LinearColor.java similarity index 100% rename from gui/src/proguard/gui/splash/LinearColor.java rename to gui/src/main/java/proguard/gui/splash/LinearColor.java diff --git a/gui/src/proguard/gui/splash/LinearDouble.java b/gui/src/main/java/proguard/gui/splash/LinearDouble.java similarity index 100% rename from gui/src/proguard/gui/splash/LinearDouble.java rename to gui/src/main/java/proguard/gui/splash/LinearDouble.java diff --git a/gui/src/proguard/gui/splash/LinearInt.java b/gui/src/main/java/proguard/gui/splash/LinearInt.java similarity index 100% rename from gui/src/proguard/gui/splash/LinearInt.java rename to gui/src/main/java/proguard/gui/splash/LinearInt.java diff --git a/gui/src/proguard/gui/splash/LinearTiming.java b/gui/src/main/java/proguard/gui/splash/LinearTiming.java similarity index 100% rename from gui/src/proguard/gui/splash/LinearTiming.java rename to gui/src/main/java/proguard/gui/splash/LinearTiming.java diff --git a/gui/src/proguard/gui/splash/OverrideGraphics2D.java b/gui/src/main/java/proguard/gui/splash/OverrideGraphics2D.java similarity index 100% rename from gui/src/proguard/gui/splash/OverrideGraphics2D.java rename to gui/src/main/java/proguard/gui/splash/OverrideGraphics2D.java diff --git a/gui/src/proguard/gui/splash/RectangleSprite.java b/gui/src/main/java/proguard/gui/splash/RectangleSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/RectangleSprite.java rename to gui/src/main/java/proguard/gui/splash/RectangleSprite.java diff --git a/gui/src/proguard/gui/splash/SawToothTiming.java b/gui/src/main/java/proguard/gui/splash/SawToothTiming.java similarity index 100% rename from gui/src/proguard/gui/splash/SawToothTiming.java rename to gui/src/main/java/proguard/gui/splash/SawToothTiming.java diff --git a/gui/src/proguard/gui/splash/ShadowedSprite.java b/gui/src/main/java/proguard/gui/splash/ShadowedSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/ShadowedSprite.java rename to gui/src/main/java/proguard/gui/splash/ShadowedSprite.java diff --git a/gui/src/proguard/gui/splash/SineTiming.java b/gui/src/main/java/proguard/gui/splash/SineTiming.java similarity index 100% rename from gui/src/proguard/gui/splash/SineTiming.java rename to gui/src/main/java/proguard/gui/splash/SineTiming.java diff --git a/gui/src/proguard/gui/splash/SmoothTiming.java b/gui/src/main/java/proguard/gui/splash/SmoothTiming.java similarity index 100% rename from gui/src/proguard/gui/splash/SmoothTiming.java rename to gui/src/main/java/proguard/gui/splash/SmoothTiming.java diff --git a/gui/src/proguard/gui/splash/SplashPanel.java b/gui/src/main/java/proguard/gui/splash/SplashPanel.java similarity index 100% rename from gui/src/proguard/gui/splash/SplashPanel.java rename to gui/src/main/java/proguard/gui/splash/SplashPanel.java diff --git a/gui/src/proguard/gui/splash/Sprite.java b/gui/src/main/java/proguard/gui/splash/Sprite.java similarity index 100% rename from gui/src/proguard/gui/splash/Sprite.java rename to gui/src/main/java/proguard/gui/splash/Sprite.java diff --git a/gui/src/proguard/gui/splash/TextSprite.java b/gui/src/main/java/proguard/gui/splash/TextSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/TextSprite.java rename to gui/src/main/java/proguard/gui/splash/TextSprite.java diff --git a/gui/src/proguard/gui/splash/TimeSwitchSprite.java b/gui/src/main/java/proguard/gui/splash/TimeSwitchSprite.java similarity index 100% rename from gui/src/proguard/gui/splash/TimeSwitchSprite.java rename to gui/src/main/java/proguard/gui/splash/TimeSwitchSprite.java diff --git a/gui/src/proguard/gui/splash/Timing.java b/gui/src/main/java/proguard/gui/splash/Timing.java similarity index 100% rename from gui/src/proguard/gui/splash/Timing.java rename to gui/src/main/java/proguard/gui/splash/Timing.java diff --git a/gui/src/proguard/gui/splash/TypeWriterString.java b/gui/src/main/java/proguard/gui/splash/TypeWriterString.java similarity index 100% rename from gui/src/proguard/gui/splash/TypeWriterString.java rename to gui/src/main/java/proguard/gui/splash/TypeWriterString.java diff --git a/gui/src/proguard/gui/splash/VariableColor.java b/gui/src/main/java/proguard/gui/splash/VariableColor.java similarity index 100% rename from gui/src/proguard/gui/splash/VariableColor.java rename to gui/src/main/java/proguard/gui/splash/VariableColor.java diff --git a/gui/src/proguard/gui/splash/VariableDouble.java b/gui/src/main/java/proguard/gui/splash/VariableDouble.java similarity index 100% rename from gui/src/proguard/gui/splash/VariableDouble.java rename to gui/src/main/java/proguard/gui/splash/VariableDouble.java diff --git a/gui/src/proguard/gui/splash/VariableFont.java b/gui/src/main/java/proguard/gui/splash/VariableFont.java similarity index 100% rename from gui/src/proguard/gui/splash/VariableFont.java rename to gui/src/main/java/proguard/gui/splash/VariableFont.java diff --git a/gui/src/proguard/gui/splash/VariableInt.java b/gui/src/main/java/proguard/gui/splash/VariableInt.java similarity index 100% rename from gui/src/proguard/gui/splash/VariableInt.java rename to gui/src/main/java/proguard/gui/splash/VariableInt.java diff --git a/gui/src/proguard/gui/splash/VariableSizeFont.java b/gui/src/main/java/proguard/gui/splash/VariableSizeFont.java similarity index 100% rename from gui/src/proguard/gui/splash/VariableSizeFont.java rename to gui/src/main/java/proguard/gui/splash/VariableSizeFont.java diff --git a/gui/src/proguard/gui/splash/VariableString.java b/gui/src/main/java/proguard/gui/splash/VariableString.java similarity index 100% rename from gui/src/proguard/gui/splash/VariableString.java rename to gui/src/main/java/proguard/gui/splash/VariableString.java diff --git a/gui/src/proguard/gui/splash/package.html b/gui/src/main/java/proguard/gui/splash/package.html similarity index 100% rename from gui/src/proguard/gui/splash/package.html rename to gui/src/main/java/proguard/gui/splash/package.html diff --git a/gui/src/proguard/gui/GUIResources.properties b/gui/src/main/resources/proguard/gui/GUIResources.properties similarity index 100% rename from gui/src/proguard/gui/GUIResources.properties rename to gui/src/main/resources/proguard/gui/GUIResources.properties diff --git a/gui/src/proguard/gui/arrow.gif b/gui/src/main/resources/proguard/gui/arrow.gif similarity index 100% rename from gui/src/proguard/gui/arrow.gif rename to gui/src/main/resources/proguard/gui/arrow.gif diff --git a/gui/src/proguard/gui/boilerplate.pro b/gui/src/main/resources/proguard/gui/boilerplate.pro similarity index 100% rename from gui/src/proguard/gui/boilerplate.pro rename to gui/src/main/resources/proguard/gui/boilerplate.pro diff --git a/gui/src/proguard/gui/default.pro b/gui/src/main/resources/proguard/gui/default.pro similarity index 100% rename from gui/src/proguard/gui/default.pro rename to gui/src/main/resources/proguard/gui/default.pro diff --git a/gui/src/proguard/gui/vtitle.png b/gui/src/main/resources/proguard/gui/vtitle.png similarity index 100% rename from gui/src/proguard/gui/vtitle.png rename to gui/src/main/resources/proguard/gui/vtitle.png diff --git a/retrace/build.gradle b/retrace/build.gradle index 6d2c9a645..d616beac3 100644 --- a/retrace/build.gradle +++ b/retrace/build.gradle @@ -10,19 +10,6 @@ repositories { mavenCentral() } -sourceSets.main { - java { - srcDirs = ['src'] - } - resources { - srcDirs = ['src'] - include '**/*.properties' - include '**/*.gif' - include '**/*.png' - include '**/*.pro' - } -} - dependencies { implementation project(':base') } diff --git a/retrace/src/proguard/retrace/FrameInfo.java b/retrace/src/main/java/proguard/retrace/FrameInfo.java similarity index 100% rename from retrace/src/proguard/retrace/FrameInfo.java rename to retrace/src/main/java/proguard/retrace/FrameInfo.java diff --git a/retrace/src/proguard/retrace/FramePattern.java b/retrace/src/main/java/proguard/retrace/FramePattern.java similarity index 100% rename from retrace/src/proguard/retrace/FramePattern.java rename to retrace/src/main/java/proguard/retrace/FramePattern.java diff --git a/retrace/src/proguard/retrace/FrameRemapper.java b/retrace/src/main/java/proguard/retrace/FrameRemapper.java similarity index 100% rename from retrace/src/proguard/retrace/FrameRemapper.java rename to retrace/src/main/java/proguard/retrace/FrameRemapper.java diff --git a/retrace/src/proguard/retrace/ReTrace.java b/retrace/src/main/java/proguard/retrace/ReTrace.java similarity index 100% rename from retrace/src/proguard/retrace/ReTrace.java rename to retrace/src/main/java/proguard/retrace/ReTrace.java diff --git a/retrace/src/proguard/retrace/package.html b/retrace/src/main/java/proguard/retrace/package.html similarity index 100% rename from retrace/src/proguard/retrace/package.html rename to retrace/src/main/java/proguard/retrace/package.html