re-natal completely removed from the project and replaced with clj-rn

alwx · alwx · commit d3b28ddbe852 · 2018-07-18T23:56:39.000+02:00
Signed-off-by: Aleksandr Pantiukhov &lt;alwxndr@gmail.com&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -57,13 +57,12 @@ android/app/build
 android/build
 android/keystores/debug.keystore
 
-# Generated by re-natal
+# Generated by clj-rn
 #
 index.android.js
 index.ios.js
 target/
 env/dev/env/config.cljs
-.re-natal.local
 externs/
 shim.js
 
@@ -87,9 +86,6 @@ figwheel_server.log
 out
 doo-index.html
 
-# Re-natal
-re-natal
-
 # Status
 Statusgo.framework
 status-go-local.aar
diff --git a/.gitignore b/.gitignore
@@ -48,13 +48,12 @@ android/app/libs
 android/app/obj
 android/keystores/debug.keystore
 
-# Generated by re-natal
+# Generated by clj-rn
 #
 index.android.js
 index.ios.js
 target/
 env/dev/env/config.cljs
-.re-natal.local
 externs/
 shim.js
 
@@ -78,9 +77,6 @@ figwheel_server.log
 out
 doo-index.html
 
-# Re-natal
-re-natal
-
 # Status
 Statusgo.framework
 status-go-local.aar
diff --git a/.re-natal b/.re-natal
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -32,7 +32,6 @@ timeout(90) {
 
           sh 'rm -rf node_modules'
           sh 'cp .env.jenkins .env'
-          sh 'lein deps'
 
           installJSDeps()
 
diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly
@@ -34,7 +34,7 @@ timeout(90) {
 
           sh 'rm -rf node_modules'
           sh 'cp .env.jenkins .env'
-          sh 'lein deps'
+
           installJSDeps()
 
           sh 'mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack'
diff --git a/Jenkinsfile.nightly_fastlane b/Jenkinsfile.nightly_fastlane
@@ -39,7 +39,6 @@ timeout(90) {
           sh 'git fetch --tags'
           sh 'rm -rf node_modules'
           sh 'cp .env.nightly .env'
-          sh 'lein deps'
 
           installJSDeps()
 
diff --git a/Jenkinsfile.parameters b/Jenkinsfile.parameters
@@ -54,7 +54,6 @@ timeout(90) {
           sh 'cat .env'
           sh 'echo "**********************************************************************"'
 
-          sh 'lein deps'
           installJSDeps()
 
           sh 'mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack'
diff --git a/Jenkinsfile.release b/Jenkinsfile.release
@@ -40,7 +40,7 @@ timeout(90) {
 
           sh 'rm -rf node_modules'
           sh 'cp .env.prod .env'
-          sh 'lein deps'
+
           installJSDeps()
 
           sh 'mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack'
diff --git a/Jenkinsfile.upload_release_android b/Jenkinsfile.upload_release_android
@@ -44,7 +44,7 @@ timeout(90) {
 
           sh 'rm -rf node_modules'
           sh 'cp .env.prod .env'
-          sh 'lein deps'
+
           installJSDeps()
 
           sh 'mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack'
diff --git a/Jenkinsfile.upload_release_ios b/Jenkinsfile.upload_release_ios
@@ -43,7 +43,7 @@ timeout(90) {
 
           sh 'rm -rf node_modules'
           sh 'cp .env.prod .env'
-          sh 'lein deps'
+
           installJSDeps()
 
           sh 'mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack'
diff --git a/Makefile b/Makefile
@@ -30,11 +30,7 @@ setup: ##@prepare Install all the requirements for status-react
 	./scripts/setup
 
 prepare: ##@prepare Install dependencies and prepare workspace
-	lein deps
 	npm install
-	./re-natal deps
-	./re-natal use-figwheel
-	./re-natal enable-source-maps
 
 prepare-ios: prepare ##@prepare Install iOS specific dependencies
 	mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack
@@ -69,41 +65,24 @@ full-prod-build: ##@build build prod for both Android and iOS
 	rm -r ./modules/react-native-status/ios/RCTStatus/Statusgo.framework/ 2> /dev/null || true
 	rm ./modules/react-native-status/android/libs/status-im/status-go/local/status-go-local.aar 2> /dev/null
 
-#----------------
-# Dev builds
-#----------------
-dev-android-real: ##@dev build for Android real device
-	./re-natal use-android-device real
-	./re-natal use-figwheel
-
-dev-android-avd: ##@dev build for Android AVD simulator
-	./re-natal use-android-device avd
-	./re-natal use-figwheel
-
-dev-android-genymotion: ##@dev build for Android Genymotion simulator
-	./re-natal use-android-device genymotion
-	./re-natal use-figwheel
-
-dev-ios-real: ##@dev build for iOS real device
-	./re-natal use-ios-device real
-	./re-natal use-figwheel
-
-dev-ios-simulator: ##@dev build for iOS simulator
-	./re-natal use-ios-device simulator
-	./re-natal use-figwheel
-
 #--------------
 # REPL
 # -------------
 
-repl: ##@repl Start REPL for iOS and Android
-	lein figwheel-repl ios android
+repl-ios-real: ##@repl Start REPL for iOS real device
+	clj -R:repl build.clj figwheel --platform ios --ios-device real
+
+repl-ios-simulator: ##@repl Start REPL for iOS simulator
+	clj -R:repl build.clj figwheel --platform ios --ios-device simulator
+
+repl-android-real: ##@repl Start REPL for Android real device
+	clj -R:repl build.clj figwheel --platform android --android-device real
 
-repl-ios: ##@repl Start REPL for iOS
-	lein figwheel-repl ios
+repl-android-avd: ##@repl Start REPL for Android AVD
+	clj -R:repl build.clj figwheel --platform android --android-device avd
 
-repl-android: ##@repl Start REPL for Android
-	lein figwheel-repl android
+repl-android-genymotion: ##@repl Start REPL for Android Genymotion
+	clj -R:repl build.clj figwheel --platform android --android-device genymotion
 
 #--------------
 # Run
@@ -160,9 +139,7 @@ startdev-%:
 	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
 	$(eval DEVICE := $(word 3, $(subst -, , $@)))
 	case "$(SYSTEM)" in \
-	  "android") ${MAKE} prepare && ${MAKE} android-ports-$(DEVICE);; \
+	  "android") ${MAKE} prepare;; \
 	  "ios")      ${MAKE} prepare-ios;; \
 	esac
-	${MAKE} dev-$(SYSTEM)-$(DEVICE)
-	${MAKE} react-native &
-	${MAKE} repl-$(SYSTEM)
+	${MAKE} repl-$(SYSTEM)-$(DEVICE)
diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
@@ -78,8 +78,6 @@ ADD .env.jenkins .env
 
 ADD ./project.clj ./
 
-RUN lein deps
-
 ADD ./package.json package-lock.json ./
 
 RUN npm install
diff --git a/env/dev/env/config.cljs b/env/dev/env/config.cljs
@@ -1,6 +1,5 @@
 (ns env.config)
 
-(def figwheel-urls {
-                    :ios "ws://localhost:3449/figwheel-ws"
-                    :android "ws://10.0.3.2:3449/figwheel-ws"
-                    })
+(def figwheel-urls {:android "ws://192.168.10.203:3449/figwheel-ws",
+ :ios "ws://localhost:3449/figwheel-ws"}
+)
diff --git a/env/dev/env/utils.cljs b/env/dev/env/utils.cljs
@@ -13,8 +13,7 @@
     (get 0 "")))
 
 (defn re-frisk-url
-  "Expects the input url to be in the form ws://host:port/figwheel-ws
-   which is generated by re-natal"
+  "Expects the input url to be in the form ws://host:port/figwheel-ws"
   [url]
   (let [host (get-host url)]
     (if (string/blank? host)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/scripts/run-ios.sh b/scripts/run-ios.sh
diff --git a/scripts/run-osx b/scripts/run-osx
diff --git a/scripts/setup b/scripts/setup
