Skip to content
Snippets Groups Projects

Upgrade and add libraries

Merged Upgrade and add libraries
library-upgrade into master
4 unresolved threads
Merged Torsten Grote requested to merge library-upgrade into master
4 unresolved threads

so they are more in line with what Briar uses

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
.idea/codeStyles/Project.xml
31 31 <option name="PACKAGES_TO_USE_STAR_IMPORTS">
32 32 <value />
33 33 </option>
34 <option name="PACKAGES_IMPORT_LAYOUT">
35 <value>
36 <package name="" alias="false" withSubpackages="true" />
37 <package name="java" alias="false" withSubpackages="true" />
38 <package name="javax" alias="false" withSubpackages="true" />
39 <package name="kotlin" alias="false" withSubpackages="true" />
40 <package name="" alias="true" withSubpackages="true" />
41 </value>
42 </option>
  • Torsten Grote
    Torsten Grote @grote started a thread on the diff
    • app/src/main/java/org/briarproject/hotspot/ServerFragment.java
    25 25
    26 26 public class ServerFragment extends Fragment {
    27 27
    28 private static String TAG = ServerFragment.class.getName();
    28 private static final String TAG = ServerFragment.class.getName();
  • Torsten Grote
    Torsten Grote @grote started a thread on the diff
    • app/src/main/res/values/styles.xml
    1 1 <resources>
    2 2
    3 <!-- Base application theme. -->
    4 <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
    5 <!-- Customize your theme here. -->
    3 <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
  • Torsten Grote
    Torsten Grote @grote started a thread on the diff
    • app/build.gradle
    23 23 }
    24 24
    25 25 dependencies {
    26 implementation fileTree(dir: 'libs', include: ['*.jar'])
    27 26 implementation 'androidx.appcompat:appcompat:1.2.0'
    27 implementation 'androidx.fragment:fragment:1.3.3'
  • Sebastian
    Sebastian @sebkur
    Developer

    Looks good to me

  • Sebastian approved this merge request

    approved this merge request

  • Torsten Grote merged

    merged

  • Torsten Grote mentioned in commit 76fde531

    mentioned in commit 76fde531

    • Please register or sign in to reply