Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
ThaliApp
Commits
0a06cab1
Commit
0a06cab1
authored
Jun 16, 2017
by
Wietse Kuipers
Browse files
Merge branch 'release-prep' into 'master'
Revert "Changed package name to match old app" See merge request
!48
parents
4e21cc60
5c52dbc8
Changes
5
Hide whitespace changes
Inline
Side-by-side
android/app/BUCK
View file @
0a06cab1
...
...
@@ -45,12 +45,12 @@ android_library(
android_build_config
(
name
=
"build_config"
,
package
=
"
"
nu
.
thalia
.
thaliapp
,
package
=
"
com
.thaliapp
"
,
)
android_resource
(
name
=
"res"
,
package
=
"
nu.thalia
.thaliapp"
,
package
=
"
com
.thaliapp"
,
res
=
"src/main/res"
,
)
...
...
android/app/build.gradle
View file @
0a06cab1
...
...
@@ -99,7 +99,7 @@ android {
}
defaultConfig
{
applicationId
"
nu.thalia
.thaliapp"
applicationId
"
com
.thaliapp"
minSdkVersion
16
targetSdkVersion
22
versionCode
1
...
...
android/app/src/main/AndroidManifest.xml
View file @
0a06cab1
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"
nu.thalia
.thaliapp"
package=
"
com
.thaliapp"
android:versionCode=
"1"
android:versionName=
"1.0"
>
...
...
android/app/src/main/java/
nu/thalia
/thaliapp/MainActivity.java
→
android/app/src/main/java/
com
/thaliapp/MainActivity.java
View file @
0a06cab1
package
nu.thalia
.thaliapp
;
package
com
.thaliapp
;
import
com.facebook.react.ReactActivity
;
...
...
android/app/src/main/java/
nu/thalia
/thaliapp/MainApplication.java
→
android/app/src/main/java/
com
/thaliapp/MainApplication.java
View file @
0a06cab1
package
nu.thalia
.thaliapp
;
package
com
.thaliapp
;
import
android.app.Application
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment