diff --git a/ide/package.php.yml b/ide/package.php.yml
index 7d80b0e..82a4740 100644
--- a/ide/package.php.yml
+++ b/ide/package.php.yml
@@ -1,5 +1,5 @@
name: nearde-ide
-version: 0.0.1+dev
+version: 0.1.0
type: project
description: DN Fork
@@ -9,7 +9,6 @@ sources:
- src
- platforms/develnext-java-platform/src
- platforms/develnext-php-platform/src
- - platforms/nearde-android-platform/src
includes:
- index.php
diff --git a/ide/platforms/nearde-android-platform/src/.data/android/build.groovy b/ide/platforms/nearde-android-platform/src/.data/android/build.groovy
deleted file mode 100644
index 59a2336..0000000
--- a/ide/platforms/nearde-android-platform/src/.data/android/build.groovy
+++ /dev/null
@@ -1,64 +0,0 @@
-apply plugin: 'com.android.application'
-
-buildscript {
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0'
- }
-}
-
-repositories {
- google()
- jcenter()
-}
-
-android {
-
- compileSdkVersion %compileSdkVersion%
- buildToolsVersion "%buildToolsVersion%"
-
- defaultConfig {
- applicationId '%applicationId%'
- minSdkVersion 14
- targetSdkVersion %targetSdkVersion%
- versionCode %versionCode%
- versionName "%versionName%"
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8 // JDK 8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- buildTypes {
- release {
- sourceSets {
- main.java.srcDirs = ['src-jvm/java']
- main.resources.srcDirs = ['resources']
- main.manifest.srcFile 'resources/AndroidManifest.xml'
- }
-
- minifyEnabled false
- //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
- splits {
- density {
- enable false
- exclude "ldpi", "tvdpi", "xxxhdpi", "400dpi", "560dpi"
- }
- }
- lintOptions {
- abortOnError false
- }
-}
-
-dependencies {
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-}
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/.data/android/resources/AndroidManifest.xml b/ide/platforms/nearde-android-platform/src/.data/android/resources/AndroidManifest.xml
deleted file mode 100644
index 436e08c..0000000
--- a/ide/platforms/nearde-android-platform/src/.data/android/resources/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/.data/android/src/index.php b/ide/platforms/nearde-android-platform/src/.data/android/src/index.php
deleted file mode 100644
index fb40c6b..0000000
--- a/ide/platforms/nearde-android-platform/src/.data/android/src/index.php
+++ /dev/null
@@ -1,22 +0,0 @@
-setTitle("Hello Android World!");
-
-$layout = new LinearLayout($activity);
-
-$button = new Button($activity);
-$button->text = "Hello world!";
-$button->on("click", function () use ($button) {
- // on button click
-});
-
-$layout->addView($button);
-$activity->setContentView($layout);
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/.data/img/icons/android32.png b/ide/platforms/nearde-android-platform/src/.data/img/icons/android32.png
deleted file mode 100644
index 0644513..0000000
Binary files a/ide/platforms/nearde-android-platform/src/.data/img/icons/android32.png and /dev/null differ
diff --git a/ide/platforms/nearde-android-platform/src/.data/img/icons/gradleAndroid16.png b/ide/platforms/nearde-android-platform/src/.data/img/icons/gradleAndroid16.png
deleted file mode 100644
index 9d96241..0000000
Binary files a/ide/platforms/nearde-android-platform/src/.data/img/icons/gradleAndroid16.png and /dev/null differ
diff --git a/ide/platforms/nearde-android-platform/src/.nearde/extensions b/ide/platforms/nearde-android-platform/src/.nearde/extensions
deleted file mode 100644
index 56c33db..0000000
--- a/ide/platforms/nearde-android-platform/src/.nearde/extensions
+++ /dev/null
@@ -1 +0,0 @@
-ide\AndroidExtension
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/ide/AndroidExtension.php b/ide/platforms/nearde-android-platform/src/ide/AndroidExtension.php
deleted file mode 100644
index 1572970..0000000
--- a/ide/platforms/nearde-android-platform/src/ide/AndroidExtension.php
+++ /dev/null
@@ -1,50 +0,0 @@
-registerProjectTemplate(new AndroidProjectTemplate());
- Ide::get()->registerProjectSupport(new AndroidProjectSupport());
- }
-
- public function onIdeStart()
- {
-
- }
-
- public function onIdeShutdown()
- {
-
- }
-
- public function getName(): string
- {
- return "Android";
- }
-
- public function getAuthor(): string
- {
- return "Venity Group";
- }
-
- public function getVersion(): string
- {
- return "0.1.0";
- }
-
- public function getIcon32(): string
- {
- return "icons/android32.png";
- }
-}
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/ide/forms/CreateAndroidProjectForm.fxml b/ide/platforms/nearde-android-platform/src/ide/forms/CreateAndroidProjectForm.fxml
deleted file mode 100644
index e49427c..0000000
--- a/ide/platforms/nearde-android-platform/src/ide/forms/CreateAndroidProjectForm.fxml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ide/platforms/nearde-android-platform/src/ide/forms/CreateAndroidProjectForm.php b/ide/platforms/nearde-android-platform/src/ide/forms/CreateAndroidProjectForm.php
deleted file mode 100644
index fdfb04d..0000000
--- a/ide/platforms/nearde-android-platform/src/ide/forms/CreateAndroidProjectForm.php
+++ /dev/null
@@ -1,189 +0,0 @@
-project = $project;
- }
-
- /**
- * @throws \php\io\IOException
- */
- protected function loadDesign()
- {
- $this->layout = (new UXLoader())->loadFromString(Stream::getContents("res://ide/forms/CreateAndroidProjectForm.fxml"));
-
- $this->title = "Android project options";
-
- $this->close->on("click", [$this, "onCloseClick"]);
- $this->create->on("click", [$this, "onCreateClick"]);
- }
-
- public function onCloseClick() {
- $this->hide();
- }
-
- /**
- * @throws \php\io\IOException
- * @throws \php\lang\IllegalArgumentException
- * @throws \php\lang\IllegalStateException
- */
- public function onCreateClick() {
- if ($this->app_name->text
- && $this->app_package->text
- && $this->version_string->text
- && $this->version_int->text
- && $this->sdkVersion->text
- && $this->buildToolsVersion) {
- $this->created = true;
-
- $this->showPreloader("Creating ...");
-
- FileUtils::putAsync($this->project->getFile("src/index.php"), Stream::getContents("res://.data/android/src/index.php"));
-
- $pkgFile = new JPPMPackageFileTemplate($this->project->getFile("package.php.yml"));
-
- $pkgFile->useProject($this->project);
- $pkgFile->setPlugins([
- 'App', "Gradle"
- ]);
-
- $pkgFile->setIncludes(['index.php']);
-
- $pkgFile->setDeps([
- 'jphp-runtime' => '*',
- 'jphp-android-ext' => "*"
- ]);
-
- $pkgFile->setDevDeps([
- 'jppm-android-plugin' => "*"
- ]);
-
- $pkgFile->save();
-
- $install = ['jppm', 'install', '-gradle'];
-
- if (Ide::get()->isWindows())
- $install = flow(['cmd.exe', '/c'], $install)->toArray();
-
- (new Process($install, $this->project->getRootDir(), Ide::get()->makeEnvironment()))->inheritIO()->startAndWait();
-
- $pkgFile->setPlugins([
- 'App'
- ]);
- $pkgFile->save();
-
- FileUtils::put($this->project->getFile("gradle/wrapper/gradle-wrapper.properties")->getAbsolutePath(), str::join([
- "distributionBase=GRADLE_USER_HOME",
- "distributionPath=wrapper/dists",
- "zipStoreBase=GRADLE_USER_HOME",
- "zipStorePath=wrapper/dists",
- "distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip"
- ], "\n"));
-
- $sdk = $this->sdkVersion->text;
-
- $settings = [
- "compileSdkVersion" => $sdk,
- "buildToolsVersion" => $this->buildToolsVersion->text,
- "targetSdkVersion" => $sdk,
- "appName" => $this->app_name->text,
- "applicationId" => $this->app_package->text,
- "versionCode" => (int) $this->version_int->text,
- "versionName" => $this->version_string->text,
- ];
-
- $script = Stream::getContents("res://.data/android/build.groovy");
- $xml = Stream::getContents("res://.data/android/resources/AndroidManifest.xml");
-
- foreach ($settings as $key => $val)
- $script = str::replace($script, "%{$key}%", $val);
-
- foreach ($settings as $key => $val)
- $xml = str::replace($xml, "%{$key}%", $val);
-
- fs::makeDir($this->project->getFile("resources")->getAbsolutePath());
- fs::makeFile($this->project->getFile("resources/AndroidManifest.xml")->getAbsolutePath());
-
- Stream::putContents($this->project->getFile("build.gradle")->getAbsolutePath(), $script);
- Stream::putContents($this->project->getFile("resources/AndroidManifest.xml")->getAbsolutePath(), $xml);
- FileUtils::copyFile("res://.data/jphp/compiler.jar", $this->project->getFile(".venity/compiler.jar")->getAbsolutePath());
-
- fs::makeFile($this->project->getIdeFile("tasks.json")->getAbsolutePath());
- Stream::putContents($this->project->getIdeFile("tasks.json")->getAbsolutePath(), Json::encode([
- "gradle-packageDebug" => [
- "type" => "android",
- "task" => "packageDebug",
- "title" => "packageDebug task"
-
- ],
- "jppm-update" => [
- "type" => "jppm",
- "task" => "update",
- "title" => "jppm update"
- ]
- ]));
-
- $this->project->register(new JavaPlatformBehaviour());
- $this->project->register(new PhpProjectBehaviour());
- $this->project->register(new BackupProjectBehaviour());
-
- $this->project->registerFormat(new ProjectFormat());
-
- $this->hide();
- } else {
- UXDialog::showAndWait("Error values", "ERROR");
- }
- }
-
- public function showAndWait()
- {
- parent::showAndWait();
-
- return $this->created;
- }
-}
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/ide/project/support/AndroidProjectSupport.php b/ide/platforms/nearde-android-platform/src/ide/project/support/AndroidProjectSupport.php
deleted file mode 100644
index da2ecce..0000000
--- a/ide/platforms/nearde-android-platform/src/ide/project/support/AndroidProjectSupport.php
+++ /dev/null
@@ -1,119 +0,0 @@
-hasBehaviour(PhpProjectBehaviour::class)
- || $project->getFile("package.php.yml")->isFile()) && $project->getTemplate() instanceof AndroidProjectTemplate;
- }
-
- /**
- * @param Project $project
- * @return mixed
- */
- public function onLink(Project $project)
- {
- /** @var ProjectFormat $projectFormat */
- if ($projectFormat = $project->getRegisteredFormat(ProjectFormat::class)) {
- $projectFormat->addControlPane(new JPPMControlPane());
- }
-
- $project->getRunDebugManager()->remove('jppm-start');
- $project->getRunDebugManager()->remove('jppm-build');
- $project->getRunDebugManager()->setStarter("gradle-packageDebug");
-
- $tasksFile = $project->getIdeFile("tasks.json");
-
- if (!fs::exists($tasksFile)) {
- fs::makeFile($tasksFile->getAbsolutePath());
- Stream::putContents($tasksFile->getAbsolutePath(), Json::encode([
- "gradle-packageDebug" => [
- "type" => "android",
- "task" => "packageDebug",
- "title" => "packageDebug task"
-
- ],
- "jppm-update" => [
- "type" => "jppm",
- "task" => "update",
- "title" => "jppm update"
- ]
- ]));
- }
-
-
- $tasks = Json::fromFile($tasksFile->getAbsolutePath());
-
- foreach ($tasks as $id => $array) {
- $project->getRunDebugManager()->add($id, [
- 'title' => $array['title'] ?? $id,
- 'icon' => $array['type'] == "gradle" ? "icons/gradle16.png" :
- $array['type'] == "android" ? "icons/gradleAndroid16.png" : "icons/gear16.png",
- 'makeStartProcess' => function () use ($project, $array) {
- $env = Ide::get()->makeEnvironment();
-
- foreach ($array['env'] as $key => $val)
- if (is_string($val))
- $env[$key] = $val;
-
- switch ($array['type']) {
- case "android":
- $args = ['jppm', 'android:compile', "-{$array["task"]}"];
- break;
-
- case "jppm":
- $args = ['jppm', $array['task']];
- break;
-
- default:
- $args = $array['command'];
- }
-
- if (Ide::get()->isWindows())
- $args = flow(['cmd', '/c'], $args)->toArray();
-
- return new Process($args, $project->getRootDir(), $env);
- },
- ]);
- }
- }
-
- /**
- * @param Project $project
- * @return mixed
- */
- public function onUnlink(Project $project)
- {
- /** @var ProjectFormat $projectFormat */
- if ($projectFormat = $project->getRegisteredFormat(ProjectFormat::class)) {
- $projectFormat->removeControlPane(JPPMControlPane::class);
- }
-
- $project->getRunDebugManager()->clear();
- $project->getRunDebugManager()->setStarter(null);
- }
-}
\ No newline at end of file
diff --git a/ide/platforms/nearde-android-platform/src/ide/project/templates/AndroidProjectTemplate.php b/ide/platforms/nearde-android-platform/src/ide/project/templates/AndroidProjectTemplate.php
deleted file mode 100644
index 8c2b579..0000000
--- a/ide/platforms/nearde-android-platform/src/ide/project/templates/AndroidProjectTemplate.php
+++ /dev/null
@@ -1,64 +0,0 @@
-showAndWait();
- }
-
- /**
- * @param Project $project
- * @return mixed
- */
- public function recoveryProject(Project $project)
- {
- if (!$project->hasBehaviour(JavaPlatformBehaviour::class)) {
- $project->register(new JavaPlatformBehaviour(), false);
- }
-
- if (!$project->hasBehaviour(PhpProjectBehaviour::class)) {
- $project->register(new PhpProjectBehaviour(), false);
- }
-
- if (!$project->hasBehaviour(BackupProjectBehaviour::class)) {
- $project->register(new BackupProjectBehaviour(), false);
- }
-
- if (!$project->getRegisteredFormat(ProjectFormat::class)) {
- $project->registerFormat(new ProjectFormat());
- }
- }
-}
\ No newline at end of file
diff --git a/ide/src/.system/application.conf b/ide/src/.system/application.conf
index 51d16b0..1c70024 100644
--- a/ide/src/.system/application.conf
+++ b/ide/src/.system/application.conf
@@ -1,7 +1,7 @@
# MAIN CONFIGURATION
app.name = Nearde IDE
-app.version = 0.1
+app.version = 0.1 (RC 1)
app.versionSnapshot = 1
app.hash = 2018013112
app.uuid =
diff --git a/package.php.yml b/package.php.yml
index 216a750..217d8ce 100644
--- a/package.php.yml
+++ b/package.php.yml
@@ -1,5 +1,5 @@
name: Nearde IDE
-version: 0.0.1+dev
+version: 0.1.0
requires:
java: {version: '>=9.0.0', arch: amd64}