Merge branch 'master' into nitanmarcel/api_update_pr

3 files changed, 0 insertions, 53 deletions

diff --git a/samples/echobot-conan/CMakeLists.txt b/samples/echobot-conan/CMakeLists.txt
deleted file mode 100644
index 24d5422..0000000
--- a/samples/echobot-conan/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-project(PackageTest CXX)
-cmake_minimum_required(VERSION 2.8.4)
-set(CMAKE_CXX_STANDARD 11)
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
-
-add_executable(example example.cpp)
-target_link_libraries(example ${CONAN_LIBS})
diff --git a/samples/echobot-conan/conanfile.py b/samples/echobot-conan/conanfile.py
deleted file mode 100644
index 732b9b8..0000000
--- a/samples/echobot-conan/conanfile.py
+++ /dev/null
@@ -1,24 +0,0 @@
-
-import os
-from conans import ConanFile, CMake, tools
-
-
-class TestConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
-
-    def build(self):
-        cmake = CMake(self)
-        # Current dir is "echobot-conan/build/<build_id>" and CMakeLists.txt is in "echobot-conan"
-        cmake.configure()
-        cmake.build()
-
-    def imports(self):
-        self.copy("*.dll", dst="bin", src="bin")
-        self.copy("*.dylib*", dst="bin", src="lib")
-        self.copy('*.so*', dst='bin', src='lib')
-
-    def test(self):
-        if not tools.cross_building(self.settings):
-            os.chdir("bin")
-            self.run(".%sexample" % os.sep)
diff --git a/samples/echobot-conan/example.cpp b/samples/echobot-conan/example.cpp
deleted file mode 100644
index f1c2863..0000000
--- a/samples/echobot-conan/example.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <tgbot/tgbot.h>
-
-using namespace std;
-using namespace TgBot;
-
-bool sigintGot = false;
-
-int main() {
-	Bot bot("PLACE YOUR TOKEN HERE");
-	bot.getEvents().onCommand("start", [&bot](Message::Ptr message) {
-		bot.getApi().sendMessage(message->chat->id, "Hi!");
-	});
-	bot.getEvents().onAnyMessage([&bot](Message::Ptr message) {
-		printf("User wrote %s\n", message->text.c_str());
-		if (StringTools::startsWith(message->text, "/start")) {
-			return;
-		}
-		bot.getApi().sendMessage(message->chat->id, "Your message is: " + message->text);
-	});
-}