Merge pull request #74 from OpenDTU-App/upgrade-react-native

Author: CommanderRedYT

.github/workflows/pull-requests.yml

@@ -21,29 +21,20 @@ jobs:
         run: git fetch --tags
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: |
-          echo "{dir}={$(yarn cache dir)}" >> $GITHUB_OUTPUT
-          echo "::set-output name=dir::{$(yarn cache dir)}"
-          cat $GITHUB_OUTPUT
-
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        id: yarn-cache
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          node-version: '18'
+          cache: 'yarn'
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile --prefer-offline
+      - name: Install node modules
+        run: |
+          yarn install --immutable --immutable-cache --check-cache
 
       - name: Cache Gradle Wrapper
         uses: actions/cache@v3

.github/workflows/release.yml

@@ -22,29 +22,20 @@ jobs:
         run: git fetch --tags --force
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: |
-          echo "{dir}={$(yarn cache dir)}" >> $GITHUB_OUTPUT
-          echo "::set-output name=dir::{$(yarn cache dir)}"
-          cat $GITHUB_OUTPUT
-
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        id: yarn-cache
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          node-version: '18'
+          cache: 'yarn'
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile --prefer-offline
+      - name: Install node modules
+        run: |
+          yarn install --immutable --immutable-cache --check-cache
 
       - name: Cache Gradle Wrapper
         uses: actions/cache@v3

.github/workflows/testing.yml

@@ -18,13 +18,13 @@ jobs:
 
       - name: Setup Node
         uses: actions/setup-node@v4
-
-      - name: Cache node modules
-        uses: c-hive/gha-yarn-cache@v1
+        with:
+          node-version: '18'
+          cache: 'yarn'
 
       - name: Install node modules
         run: |
-          yarn install --frozen-lockfile --prefer-offline
+          yarn install --immutable --immutable-cache --check-cache
 
       - name: Run ESLint
         run: |

.gitignore

@@ -20,7 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-ios/.xcode.env.local
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -56,11 +56,19 @@ yarn-error.log
 *.jsbundle
 
 # Ruby / CocoaPods
-/ios/Pods/
+**/Pods/
 /vendor/bundle/
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
 
 # testing
 /coverage
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarn/releases/yarn-3.6.4.cjs

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

.yarnrc.yml

@@ -3,5 +3,7 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.13'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

Gemfile

@@ -1,7 +1,7 @@
 /**
  * @format
  */
-// Note: import explicitly to use the types shiped with jest.
+// Note: import explicitly to use the types shipped with jest.
 import { it } from '@jest/globals';
 
 import React from 'react';

__tests__/App.test.tsx

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
@@ -72,7 +73,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 android {
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "xyz.commanderred.opendtuapp"
     defaultConfig {
@@ -135,12 +137,6 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {

android/app/build.gradle

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+          xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:usesCleartextTraffic="true"
-        tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+            android:usesCleartextTraffic="true"
+            tools:targetApi="28"
+            tools:ignore="GoogleAppIndexingWarning"/>
 </manifest>